manually duplicating #629
Merge remote-tracking branch 'timrwood/master' into develop