Merge "Initial drop of gmock 1.7.0"