Sync the gtest_addition branch with trunk up to r1502047. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/gtest_addition@1502060 13f79535-47bb-0310-9956-ffa450edef68