Cherry picked from 2.0 master 34c4e122 Conflicts: src/exports.js
Attach a file by drag & drop or click to upload