Early version of the patch OK'd by martin@. Fixes #1855.
Attach a file by drag & drop or click to upload
