As requested in original PR (#1617). Also remove some extraneous whitespace that crept in.
Attach a file by drag & drop or click to upload
