Copy a fix by jperkin for bug#30624 into the 5.1.22 build tree.
Attach a file by drag & drop or click to upload
