This should supersede revision e3ec6b17260c (but please test before removing that).
Attach a file by drag & drop or click to upload
