Thanks Simon Percivall for the report, and Simon Charette and Tim Graham for the reviews. Backport of 02260ea3 from master.