Made unittest/gtest.hpp hide the right clang diagnostics for gtest-1.6.0.
Merge branch 'next' into sam_clanggtest
Fixed build problems after merge from next into sam_clanggtest.