Going to merge this manually since it's not fast-forwardable.
Thanks for the patch!
Commit f44aecf2 fixes this pull-request
Pull-Request has been merged by pingou