MOAR WTF
Merge branch 'redelete-that-stupid-project-again' into affine-spaces