Patch by Vajrasky Kok, with slight modification to the tests by me.
Attach a file by drag & drop or click to upload
