Partially closes issue 9346. Thanks Brian Brazil for the patch.
Attach a file by drag & drop or click to upload
