Fixes #3895
CC: @ryanlerch @cverna
rebased onto 354dd8c5ff8408c9f95c59627a24b6a405f79d0f
Looks and seems fine, thanks! :)
Commit 8d335643 fixes this pull-request
Pull-Request has been merged by pingou
Fixes #3895
CC: @ryanlerch @cverna