If you think this commit is too much a feature than a bugfix, please revert.
Attach a file by drag & drop or click to upload
