Typo
Merge branch 'cmake-build' into cmake-osx