Also includes various other fixes from Matt Tolentino
Attach a file by drag & drop or click to upload
