This fixes https://savannah.gnu.org/bugs/?47710 and fixes https://savannah.gnu.org/bugs/?49088.
Attach a file by drag & drop or click to upload
