Merge commit 'b66b9a6ff4aca4bac29b8af7154fca082547b6d4' into Matrix4_Improvement
Updated for initial conversion to Matrix4.

Signed-off-by: Jared Woolston <jwoolston@tenkiv.com>
Merge branch 'Matrix4_Improvement'