(Cherry-picked from 0705be475092aede1eddae01319ec931fb9c65fc) Fixes gh-2286 Closes gh-2287 Ref trac-11733
Attach a file by drag & drop or click to upload
