Patch from Raphael Geissert and Modestas Vainius. See issue #9659.
Attach a file by drag & drop or click to upload
