Thanks Simon Charette for the report.
Thanks simonpercivall for the report and bmispelon for the review. Backport of 2daada800f from master
2daada800f