Back-porting a patch from upstream's github repository.
Attach a file by drag & drop or click to upload
