Merge remote-tracking branch 'github_google/master' into master-github_frosteyes

# Conflicts: # .gitignore

Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
# Conflicts: # .gitignore
34355c0e · Claus Stovgaard · a6418a4d · 16bfba08 · 34355c0e · 34355c0e
Commit 34355c0e authored Aug 31, 2017 by Claus Stovgaard
20 changed files
--- a/googlemock/test/gmock_test.cc
+++ b/googlemock/test/gmock_test.cc
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
--- a/googletest/Makefile.am
+++ b/googletest/Makefile.am
--- a/googletest/cmake/gtest.pc.in
+++ b/googletest/cmake/gtest.pc.in
--- a/googletest/cmake/gtest_main.pc.in
+++ b/googletest/cmake/gtest_main.pc.in
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
--- a/googletest/docs/AdvancedGuide.md
+++ b/googletest/docs/AdvancedGuide.md
--- a/googletest/docs/DevGuide.md
+++ b/googletest/docs/DevGuide.md
--- a/googletest/docs/Documentation.md
+++ b/googletest/docs/Documentation.md
--- a/googletest/docs/FAQ.md
+++ b/googletest/docs/FAQ.md
--- a/googletest/docs/Pkgconfig.md
+++ b/googletest/docs/Pkgconfig.md
--- a/googletest/docs/Primer.md
+++ b/googletest/docs/Primer.md
--- a/googletest/docs/PumpManual.md
+++ b/googletest/docs/PumpManual.md
--- a/googletest/docs/V1_5_AdvancedGuide.md
+++ b/googletest/docs/V1_5_AdvancedGuide.md
--- a/googletest/docs/V1_5_Documentation.md
+++ b/googletest/docs/V1_5_Documentation.md
--- a/googletest/docs/V1_5_FAQ.md
+++ b/googletest/docs/V1_5_FAQ.md
--- a/googletest/docs/V1_5_Primer.md
+++ b/googletest/docs/V1_5_Primer.md
--- a/googletest/docs/V1_5_PumpManual.md
+++ b/googletest/docs/V1_5_PumpManual.md
--- a/googletest/docs/V1_5_XcodeGuide.md
+++ b/googletest/docs/V1_5_XcodeGuide.md
--- a/googletest/docs/V1_6_AdvancedGuide.md
+++ b/googletest/docs/V1_6_AdvancedGuide.md