Fixes #4429 ?
Works great, thanks for this ! :)
I'll merge the PR manually to save you the rebase :)
Commit 86ae8f52 fixes this pull-request
Pull-Request has been merged by pingou
Fixes #4429 ?