Backporting bug patch from 5.5 to 5.1. This fix is applicable to BUG#14362617 as well
Attach a file by drag & drop or click to upload
