Compiler changes for Xcode 5.
Merge branch 'master' into feature/normal_matrix