rebase affine-spaces, ditch affine_map for pull request.
merge master
Merge branch 'point' into affine-spaces

Conflicts:
	geometry/geometry.vcxproj.filters