master => geometry-zxy

Reviewing master merge as PR to make sure I got the conflicts right...