Fixes ticket #699. Patch also provided by Peter Ross.
Attach a file by drag & drop or click to upload