Straight forward backport. Approved by Jimmy, rb#2656
Attach a file by drag & drop or click to upload
