Manual transfer of the fix for bug#20815 from 5.0 to 5.1
Attach a file by drag & drop or click to upload
