manual adding the fix for bug#15828 which did not automerge
Attach a file by drag & drop or click to upload
