We need to revert the temporary hack in 71ebc01d, hence the merge.
Attach a file by drag & drop or click to upload
