This fixes up a merge of commit 4fb8f7d0 with respect to commit ea37b144.
Attach a file by drag & drop or click to upload
