Mostly from 2.4. Adds some new ones, and removes some dupes.
Attach a file by drag & drop or click to upload
