After pleroy's review.
Merge branch 'point' into affine-spaces

Conflicts:
	geometry/geometry.vcxproj
	geometry/geometry.vcxproj.filters