Based on patch by Philipp Hagemeister. This fixes a regression caused by revision 6b314f5c9404.
Attach a file by drag & drop or click to upload
