Backporting patch committed for bug 18008907 to 5.5 and 5.6.
Attach a file by drag & drop or click to upload
