This matches the standard library more closely. Fixes #1932 and fixes #1931.
Attach a file by drag & drop or click to upload
