Patch by Angelo Mottola, reviewed by MvL, tests by me.
Attach a file by drag & drop or click to upload
