Do not use C++11 for gtest: Mavericks fix
Merge branch 'scaffold' into develop