Thanks :)
I'm going to merge this one manually to save you the rebase :)
Commit fa5b3b75 fixes this pull-request
Pull-Request has been merged by pingou