Fixes Bugzilla #1191. This patch is based on work done by Vittorio Giovara.
Attach a file by drag & drop or click to upload
