Merging with van's copy
Merge branch 'master' of https://github.com/CapnSmithers/UniversePoint
Merging conflicted copies