patch by tevans, applied to master, backported to 3.10 by tevans
Attach a file by drag & drop or click to upload
