finished (re-application of this patch, which was accidentally undone by Eli).
Attach a file by drag & drop or click to upload
