319 files changed, 17 insertions, 10 deletions

diff --git a/ext/googletest/SConscript b/ext/googletest/SConscript
index 27013f265..6792a756c 100644
--- a/ext/googletest/SConscript
+++ b/ext/googletest/SConscript
@@ -1,5 +1,8 @@
 # Copyright 2017 Google Inc.
 #
+# Copyright (c) 2018 ARM Limited
+# All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met: redistributions of source code must retain the above copyright
@@ -28,22 +31,26 @@ Import('main')
 # The root of the build directory.
 build = Dir('.')
 # The root of the original directory.
-base = build.srcdir
+gtest_base = build.srcdir.Dir('googletest')
+gmock_base = build.srcdir.Dir('googlemock')
 # Include files from the original directory.
-include = base.Dir('include')
+gtest_include = gtest_base.Dir('include')
+gmock_include = gmock_base.Dir('include')
 # Use source files from the build directory so build products end up there.
-src = Dir('src')
+gtest_src = Dir('googletest/src')
+gmock_src = Dir('googlemock/src')
 
-main.Append(CPPPATH=[include])
+main.Append(CPPPATH=[gtest_include, gmock_include])
 main.Append(LIBPATH=[build])
 
 env = main.Clone(CPPFLAGS='-g -Wall -Wextra -pthread'
-                          ' -Wno-undef -isystem %s' % include)
-env.Append(CPPPATH=[base])
+                          ' -Wno-undef -isystem %s -isystem %s' % (gtest_include, gmock_include))
+env.Append(CPPPATH=[gtest_base, gmock_base])
 
-gtest_all = env.Object(src.File('gtest-all.cc'))
+gtest_all = env.Object(gtest_src.File('gtest-all.cc'))
+gmock_all = env.Object(gmock_src.File('gmock-all.cc'))
 gtest_main = env.StaticLibrary(
-    target='gtest_main', source=[gtest_all, src.File('gtest_main.cc')])
+    target='libgtest', source=[gtest_all, gmock_all, gtest_src.File('gtest_main.cc')])
 
-main['GTEST_LIBS'] = ['gtest_main', 'pthread']
-main['GTEST_CPPFLAGS'] = '-pthread -Wno-undef -isystem %s' % include.abspath
+main['GTEST_LIBS'] = ['libgtest', 'pthread']
+main['GTEST_CPPFLAGS'] = '-pthread -DUSE_GMOCK -Wno-undef -isystem %s' % gtest_include.abspath
diff --git a/ext/googlemock/CHANGES b/ext/googletest/googlemock/CHANGES
index d6f2f760e..d6f2f760e 100644
--- a/ext/googlemock/CHANGES
+++ b/ext/googletest/googlemock/CHANGES
diff --git a/ext/googlemock/CMakeLists.txt b/ext/googletest/googlemock/CMakeLists.txt
index beb259a2e..beb259a2e 100644
--- a/ext/googlemock/CMakeLists.txt
+++ b/ext/googletest/googlemock/CMakeLists.txt
diff --git a/ext/googlemock/CONTRIBUTORS b/ext/googletest/googlemock/CONTRIBUTORS
index 6e9ae362b..6e9ae362b 100644
--- a/ext/googlemock/CONTRIBUTORS
+++ b/ext/googletest/googlemock/CONTRIBUTORS
diff --git a/ext/googlemock/LICENSE b/ext/googletest/googlemock/LICENSE
index 1941a11f8..1941a11f8 100644
--- a/ext/googlemock/LICENSE
+++ b/ext/googletest/googlemock/LICENSE
diff --git a/ext/googlemock/Makefile.am b/ext/googletest/googlemock/Makefile.am
index 9adbc5163..9adbc5163 100644
--- a/ext/googlemock/Makefile.am
+++ b/ext/googletest/googlemock/Makefile.am
diff --git a/ext/googlemock/README.md b/ext/googletest/googlemock/README.md
index 332beab38..332beab38 100644
--- a/ext/googlemock/README.md
+++ b/ext/googletest/googlemock/README.md
diff --git a/ext/googlemock/build-aux/.keep b/ext/googletest/googlemock/build-aux/.keep
index e69de29bb..e69de29bb 100644
--- a/ext/googlemock/build-aux/.keep
+++ b/ext/googletest/googlemock/build-aux/.keep
diff --git a/ext/googlemock/configure.ac b/ext/googletest/googlemock/configure.ac
index 3b740f205..3b740f205 100644
--- a/ext/googlemock/configure.ac
+++ b/ext/googletest/googlemock/configure.ac
diff --git a/ext/googlemock/docs/CheatSheet.md b/ext/googletest/googlemock/docs/CheatSheet.md
index ef4451b87..ef4451b87 100644
--- a/ext/googlemock/docs/CheatSheet.md
+++ b/ext/googletest/googlemock/docs/CheatSheet.md
diff --git a/ext/googlemock/docs/CookBook.md b/ext/googletest/googlemock/docs/CookBook.md
index c52f1009d..c52f1009d 100644
--- a/ext/googlemock/docs/CookBook.md
+++ b/ext/googletest/googlemock/docs/CookBook.md
diff --git a/ext/googlemock/docs/DesignDoc.md b/ext/googletest/googlemock/docs/DesignDoc.md
index 3f515c3b6..3f515c3b6 100644
--- a/ext/googlemock/docs/DesignDoc.md
+++ b/ext/googletest/googlemock/docs/DesignDoc.md
diff --git a/ext/googlemock/docs/DevGuide.md b/ext/googletest/googlemock/docs/DevGuide.md
index f4bab75ca..f4bab75ca 100644
--- a/ext/googlemock/docs/DevGuide.md
+++ b/ext/googletest/googlemock/docs/DevGuide.md
diff --git a/ext/googlemock/docs/Documentation.md b/ext/googletest/googlemock/docs/Documentation.md
index 444151ee9..444151ee9 100644
--- a/ext/googlemock/docs/Documentation.md
+++ b/ext/googletest/googlemock/docs/Documentation.md
diff --git a/ext/googlemock/docs/ForDummies.md b/ext/googletest/googlemock/docs/ForDummies.md
index 0da4cbe27..0da4cbe27 100644
--- a/ext/googlemock/docs/ForDummies.md
+++ b/ext/googletest/googlemock/docs/ForDummies.md
diff --git a/ext/googlemock/docs/FrequentlyAskedQuestions.md b/ext/googletest/googlemock/docs/FrequentlyAskedQuestions.md
index 5eac83f4b..5eac83f4b 100644
--- a/ext/googlemock/docs/FrequentlyAskedQuestions.md
+++ b/ext/googletest/googlemock/docs/FrequentlyAskedQuestions.md
diff --git a/ext/googlemock/docs/KnownIssues.md b/ext/googletest/googlemock/docs/KnownIssues.md
index adadf5144..adadf5144 100644
--- a/ext/googlemock/docs/KnownIssues.md
+++ b/ext/googletest/googlemock/docs/KnownIssues.md
diff --git a/ext/googlemock/docs/v1_5/CheatSheet.md b/ext/googletest/googlemock/docs/v1_5/CheatSheet.md
index 3c7bed4c6..3c7bed4c6 100644
--- a/ext/googlemock/docs/v1_5/CheatSheet.md
+++ b/ext/googletest/googlemock/docs/v1_5/CheatSheet.md
diff --git a/ext/googlemock/docs/v1_5/CookBook.md b/ext/googletest/googlemock/docs/v1_5/CookBook.md
index 26e153c6b..26e153c6b 100644
--- a/ext/googlemock/docs/v1_5/CookBook.md
+++ b/ext/googletest/googlemock/docs/v1_5/CookBook.md
diff --git a/ext/googlemock/docs/v1_5/Documentation.md b/ext/googletest/googlemock/docs/v1_5/Documentation.md
index 315b0a298..315b0a298 100644
--- a/ext/googlemock/docs/v1_5/Documentation.md
+++ b/ext/googletest/googlemock/docs/v1_5/Documentation.md
diff --git a/ext/googlemock/docs/v1_5/ForDummies.md b/ext/googletest/googlemock/docs/v1_5/ForDummies.md
index fcc3b5617..fcc3b5617 100644
--- a/ext/googlemock/docs/v1_5/ForDummies.md
+++ b/ext/googletest/googlemock/docs/v1_5/ForDummies.md
diff --git a/ext/googlemock/docs/v1_5/FrequentlyAskedQuestions.md b/ext/googletest/googlemock/docs/v1_5/FrequentlyAskedQuestions.md
index 7593243c3..7593243c3 100644
--- a/ext/googlemock/docs/v1_5/FrequentlyAskedQuestions.md
+++ b/ext/googletest/googlemock/docs/v1_5/FrequentlyAskedQuestions.md
diff --git a/ext/googlemock/docs/v1_6/CheatSheet.md b/ext/googletest/googlemock/docs/v1_6/CheatSheet.md
index 91de1d210..91de1d210 100644
--- a/ext/googlemock/docs/v1_6/CheatSheet.md
+++ b/ext/googletest/googlemock/docs/v1_6/CheatSheet.md
diff --git a/ext/googlemock/docs/v1_6/CookBook.md b/ext/googletest/googlemock/docs/v1_6/CookBook.md
index f5975a003..f5975a003 100644
--- a/ext/googlemock/docs/v1_6/CookBook.md
+++ b/ext/googletest/googlemock/docs/v1_6/CookBook.md
diff --git a/ext/googlemock/docs/v1_6/Documentation.md b/ext/googletest/googlemock/docs/v1_6/Documentation.md
index dcc9156c2..dcc9156c2 100644
--- a/ext/googlemock/docs/v1_6/Documentation.md
+++ b/ext/googletest/googlemock/docs/v1_6/Documentation.md
diff --git a/ext/googlemock/docs/v1_6/ForDummies.md b/ext/googletest/googlemock/docs/v1_6/ForDummies.md
index 19ee63ab0..19ee63ab0 100644
--- a/ext/googlemock/docs/v1_6/ForDummies.md
+++ b/ext/googletest/googlemock/docs/v1_6/ForDummies.md
diff --git a/ext/googlemock/docs/v1_6/FrequentlyAskedQuestions.md b/ext/googletest/googlemock/docs/v1_6/FrequentlyAskedQuestions.md
index f74715d2e..f74715d2e 100644
--- a/ext/googlemock/docs/v1_6/FrequentlyAskedQuestions.md
+++ b/ext/googletest/googlemock/docs/v1_6/FrequentlyAskedQuestions.md
diff --git a/ext/googlemock/docs/v1_7/CheatSheet.md b/ext/googletest/googlemock/docs/v1_7/CheatSheet.md
index db421e51b..db421e51b 100644
--- a/ext/googlemock/docs/v1_7/CheatSheet.md
+++ b/ext/googletest/googlemock/docs/v1_7/CheatSheet.md
diff --git a/ext/googlemock/docs/v1_7/CookBook.md b/ext/googletest/googlemock/docs/v1_7/CookBook.md
index 419a00107..419a00107 100644
--- a/ext/googlemock/docs/v1_7/CookBook.md
+++ b/ext/googletest/googlemock/docs/v1_7/CookBook.md
diff --git a/ext/googlemock/docs/v1_7/Documentation.md b/ext/googletest/googlemock/docs/v1_7/Documentation.md
index d9181f28e..d9181f28e 100644
--- a/ext/googlemock/docs/v1_7/Documentation.md
+++ b/ext/googletest/googlemock/docs/v1_7/Documentation.md
diff --git a/ext/googlemock/docs/v1_7/ForDummies.md b/ext/googletest/googlemock/docs/v1_7/ForDummies.md
index ee03c5b98..ee03c5b98 100644
--- a/ext/googlemock/docs/v1_7/ForDummies.md
+++ b/ext/googletest/googlemock/docs/v1_7/ForDummies.md
diff --git a/ext/googlemock/docs/v1_7/FrequentlyAskedQuestions.md b/ext/googletest/googlemock/docs/v1_7/FrequentlyAskedQuestions.md
index fa21233aa..fa21233aa 100644
--- a/ext/googlemock/docs/v1_7/FrequentlyAskedQuestions.md
+++ b/ext/googletest/googlemock/docs/v1_7/FrequentlyAskedQuestions.md
diff --git a/ext/googlemock/include/gmock/gmock-actions.h b/ext/googletest/googlemock/include/gmock/gmock-actions.h
index b3f654af3..b3f654af3 100644
--- a/ext/googlemock/include/gmock/gmock-actions.h
+++ b/ext/googletest/googlemock/include/gmock/gmock-actions.h
diff --git a/ext/googlemock/include/gmock/gmock-cardinalities.h b/ext/googletest/googlemock/include/gmock/gmock-cardinalities.h
index fc315f92a..fc315f92a 100644
--- a/ext/googlemock/include/gmock/gmock-cardinalities.h
+++ b/ext/googletest/googlemock/include/gmock/gmock-cardinalities.h
diff --git a/ext/googlemock/include/gmock/gmock-generated-actions.h b/ext/googletest/googlemock/include/gmock/gmock-generated-actions.h
index b5a889c0c..b5a889c0c 100644
--- a/ext/googlemock/include/gmock/gmock-generated-actions.h
+++ b/ext/googletest/googlemock/include/gmock/gmock-generated-actions.h
diff --git a/ext/googlemock/include/gmock/gmock-generated-actions.h.pump b/ext/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump
index 66d9f9d55..66d9f9d55 100644
--- a/ext/googlemock/include/gmock/gmock-generated-actions.h.pump
+++ b/ext/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump
diff --git a/ext/googlemock/include/gmock/gmock-generated-function-mockers.h b/ext/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h
index 4fa5ca948..4fa5ca948 100644
--- a/ext/googlemock/include/gmock/gmock-generated-function-mockers.h
+++ b/ext/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h
diff --git a/ext/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/ext/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump
index 811502d0c..811502d0c 100644
--- a/ext/googlemock/include/gmock/gmock-generated-function-mockers.h.pump
+++ b/ext/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump
diff --git a/ext/googlemock/include/gmock/gmock-generated-matchers.h b/ext/googletest/googlemock/include/gmock/gmock-generated-matchers.h
index 57056fd91..57056fd91 100644
--- a/ext/googlemock/include/gmock/gmock-generated-matchers.h
+++ b/ext/googletest/googlemock/include/gmock/gmock-generated-matchers.h
diff --git a/ext/googlemock/include/gmock/gmock-generated-matchers.h.pump b/ext/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump
index de30c2c92..de30c2c92 100644
--- a/ext/googlemock/include/gmock/gmock-generated-matchers.h.pump
+++ b/ext/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump
diff --git a/ext/googlemock/include/gmock/gmock-generated-nice-strict.h b/ext/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h
index 4095f4d5b..4095f4d5b 100644
--- a/ext/googlemock/include/gmock/gmock-generated-nice-strict.h
+++ b/ext/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h
diff --git a/ext/googlemock/include/gmock/gmock-generated-nice-strict.h.pump b/ext/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump
index 3ee1ce7f3..3ee1ce7f3 100644
--- a/ext/googlemock/include/gmock/gmock-generated-nice-strict.h.pump
+++ b/ext/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump
diff --git a/ext/googlemock/include/gmock/gmock-matchers.h b/ext/googletest/googlemock/include/gmock/gmock-matchers.h
index 33b37a7a5..33b37a7a5 100644
--- a/ext/googlemock/include/gmock/gmock-matchers.h
+++ b/ext/googletest/googlemock/include/gmock/gmock-matchers.h
diff --git a/ext/googlemock/include/gmock/gmock-more-actions.h b/ext/googletest/googlemock/include/gmock/gmock-more-actions.h
index 3d387b6b7..3d387b6b7 100644
--- a/ext/googlemock/include/gmock/gmock-more-actions.h
+++ b/ext/googletest/googlemock/include/gmock/gmock-more-actions.h
diff --git a/ext/googlemock/include/gmock/gmock-more-matchers.h b/ext/googletest/googlemock/include/gmock/gmock-more-matchers.h
index 3db899f42..3db899f42 100644
--- a/ext/googlemock/include/gmock/gmock-more-matchers.h
+++ b/ext/googletest/googlemock/include/gmock/gmock-more-matchers.h
diff --git a/ext/googlemock/include/gmock/gmock-spec-builders.h b/ext/googletest/googlemock/include/gmock/gmock-spec-builders.h
index fed7de66b..fed7de66b 100644
--- a/ext/googlemock/include/gmock/gmock-spec-builders.h
+++ b/ext/googletest/googlemock/include/gmock/gmock-spec-builders.h
diff --git a/ext/googlemock/include/gmock/gmock.h b/ext/googletest/googlemock/include/gmock/gmock.h
index 6735c71bf..6735c71bf 100644
--- a/ext/googlemock/include/gmock/gmock.h
+++ b/ext/googletest/googlemock/include/gmock/gmock.h
diff --git a/ext/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
index 7dc3b1ad5..7dc3b1ad5 100644
--- a/ext/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
+++ b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
diff --git a/ext/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
index d26c8a08a..d26c8a08a 100644
--- a/ext/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
+++ b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
diff --git a/ext/googlemock/include/gmock/internal/custom/gmock-matchers.h b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
index f2efef91d..f2efef91d 100644
--- a/ext/googlemock/include/gmock/internal/custom/gmock-matchers.h
+++ b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
diff --git a/ext/googlemock/include/gmock/internal/custom/gmock-port.h b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
index 9ce8bfe06..9ce8bfe06 100644
--- a/ext/googlemock/include/gmock/internal/custom/gmock-port.h
+++ b/ext/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
diff --git a/ext/googlemock/include/gmock/internal/gmock-generated-internal-utils.h b/ext/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h
index 7811e43f8..7811e43f8 100644
--- a/ext/googlemock/include/gmock/internal/gmock-generated-internal-utils.h
+++ b/ext/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h
diff --git a/ext/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump b/ext/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
index 800af17c1..800af17c1 100644
--- a/ext/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
+++ b/ext/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
diff --git a/ext/googlemock/include/gmock/internal/gmock-internal-utils.h b/ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
index e2ddb05c9..e2ddb05c9 100644
--- a/ext/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/ext/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
diff --git a/ext/googlemock/include/gmock/internal/gmock-port.h b/ext/googletest/googlemock/include/gmock/internal/gmock-port.h
index 63f4a6802..63f4a6802 100644
--- a/ext/googlemock/include/gmock/internal/gmock-port.h
+++ b/ext/googletest/googlemock/include/gmock/internal/gmock-port.h
diff --git a/ext/googlemock/make/Makefile b/ext/googletest/googlemock/make/Makefile
index 7c13e05fa..7c13e05fa 100644
--- a/ext/googlemock/make/Makefile
+++ b/ext/googletest/googlemock/make/Makefile
diff --git a/ext/googlemock/msvc/2005/gmock.sln b/ext/googletest/googlemock/msvc/2005/gmock.sln
index 0cf57a35a..0cf57a35a 100644
--- a/ext/googlemock/msvc/2005/gmock.sln
+++ b/ext/googletest/googlemock/msvc/2005/gmock.sln
diff --git a/ext/googlemock/msvc/2005/gmock.vcproj b/ext/googletest/googlemock/msvc/2005/gmock.vcproj
index b7de58f87..b7de58f87 100644
--- a/ext/googlemock/msvc/2005/gmock.vcproj
+++ b/ext/googletest/googlemock/msvc/2005/gmock.vcproj
diff --git a/ext/googlemock/msvc/2005/gmock_config.vsprops b/ext/googletest/googlemock/msvc/2005/gmock_config.vsprops
index 9b5ff7f38..9b5ff7f38 100644
--- a/ext/googlemock/msvc/2005/gmock_config.vsprops
+++ b/ext/googletest/googlemock/msvc/2005/gmock_config.vsprops
diff --git a/ext/googlemock/msvc/2005/gmock_main.vcproj b/ext/googletest/googlemock/msvc/2005/gmock_main.vcproj
index 22ff8a615..22ff8a615 100644
--- a/ext/googlemock/msvc/2005/gmock_main.vcproj
+++ b/ext/googletest/googlemock/msvc/2005/gmock_main.vcproj
diff --git a/ext/googlemock/msvc/2005/gmock_test.vcproj b/ext/googletest/googlemock/msvc/2005/gmock_test.vcproj
index 50d677394..50d677394 100644
--- a/ext/googlemock/msvc/2005/gmock_test.vcproj
+++ b/ext/googletest/googlemock/msvc/2005/gmock_test.vcproj
diff --git a/ext/googlemock/msvc/2010/gmock.sln b/ext/googletest/googlemock/msvc/2010/gmock.sln
index 3c356e145..3c356e145 100644
--- a/ext/googlemock/msvc/2010/gmock.sln
+++ b/ext/googletest/googlemock/msvc/2010/gmock.sln
diff --git a/ext/googlemock/msvc/2010/gmock.vcxproj b/ext/googletest/googlemock/msvc/2010/gmock.vcxproj
index cf49d531f..cf49d531f 100644
--- a/ext/googlemock/msvc/2010/gmock.vcxproj
+++ b/ext/googletest/googlemock/msvc/2010/gmock.vcxproj
diff --git a/ext/googlemock/msvc/2010/gmock_config.props b/ext/googletest/googlemock/msvc/2010/gmock_config.props
index 77bc95b19..77bc95b19 100644
--- a/ext/googlemock/msvc/2010/gmock_config.props
+++ b/ext/googletest/googlemock/msvc/2010/gmock_config.props
diff --git a/ext/googlemock/msvc/2010/gmock_main.vcxproj b/ext/googletest/googlemock/msvc/2010/gmock_main.vcxproj
index 06d3b61e8..06d3b61e8 100644
--- a/ext/googlemock/msvc/2010/gmock_main.vcxproj
+++ b/ext/googletest/googlemock/msvc/2010/gmock_main.vcxproj
diff --git a/ext/googlemock/msvc/2010/gmock_test.vcxproj b/ext/googletest/googlemock/msvc/2010/gmock_test.vcxproj
index ea33bf099..ea33bf099 100644
--- a/ext/googlemock/msvc/2010/gmock_test.vcxproj
+++ b/ext/googletest/googlemock/msvc/2010/gmock_test.vcxproj
diff --git a/ext/googlemock/msvc/2015/gmock.sln b/ext/googletest/googlemock/msvc/2015/gmock.sln
index c59e07fcb..c59e07fcb 100644
--- a/ext/googlemock/msvc/2015/gmock.sln
+++ b/ext/googletest/googlemock/msvc/2015/gmock.sln
diff --git a/ext/googlemock/msvc/2015/gmock.vcxproj b/ext/googletest/googlemock/msvc/2015/gmock.vcxproj
index d5ddd0910..d5ddd0910 100644
--- a/ext/googlemock/msvc/2015/gmock.vcxproj
+++ b/ext/googletest/googlemock/msvc/2015/gmock.vcxproj
diff --git a/ext/googlemock/msvc/2015/gmock_config.props b/ext/googletest/googlemock/msvc/2015/gmock_config.props
index 77bc95b19..77bc95b19 100644
--- a/ext/googlemock/msvc/2015/gmock_config.props
+++ b/ext/googletest/googlemock/msvc/2015/gmock_config.props
diff --git a/ext/googlemock/msvc/2015/gmock_main.vcxproj b/ext/googletest/googlemock/msvc/2015/gmock_main.vcxproj
index 76cc68b9a..76cc68b9a 100644
--- a/ext/googlemock/msvc/2015/gmock_main.vcxproj
+++ b/ext/googletest/googlemock/msvc/2015/gmock_main.vcxproj
diff --git a/ext/googlemock/msvc/2015/gmock_test.vcxproj b/ext/googletest/googlemock/msvc/2015/gmock_test.vcxproj
index 76ea5534a..76ea5534a 100644
--- a/ext/googlemock/msvc/2015/gmock_test.vcxproj
+++ b/ext/googletest/googlemock/msvc/2015/gmock_test.vcxproj
diff --git a/ext/googlemock/scripts/fuse_gmock_files.py b/ext/googletest/googlemock/scripts/fuse_gmock_files.py
index cb7fdf2f7..cb7fdf2f7 100755
--- a/ext/googlemock/scripts/fuse_gmock_files.py
+++ b/ext/googletest/googlemock/scripts/fuse_gmock_files.py
diff --git a/ext/googlemock/scripts/generator/LICENSE b/ext/googletest/googlemock/scripts/generator/LICENSE
index 87ea06365..87ea06365 100644
--- a/ext/googlemock/scripts/generator/LICENSE
+++ b/ext/googletest/googlemock/scripts/generator/LICENSE
diff --git a/ext/googlemock/scripts/generator/README b/ext/googletest/googlemock/scripts/generator/README
index d6f95974b..d6f95974b 100644
--- a/ext/googlemock/scripts/generator/README
+++ b/ext/googletest/googlemock/scripts/generator/README
diff --git a/ext/googlemock/scripts/generator/README.cppclean b/ext/googletest/googlemock/scripts/generator/README.cppclean
index 65431b617..65431b617 100644
--- a/ext/googlemock/scripts/generator/README.cppclean
+++ b/ext/googletest/googlemock/scripts/generator/README.cppclean
diff --git a/ext/googlemock/scripts/generator/cpp/__init__.py b/ext/googletest/googlemock/scripts/generator/cpp/__init__.py
index e69de29bb..e69de29bb 100755
--- a/ext/googlemock/scripts/generator/cpp/__init__.py
+++ b/ext/googletest/googlemock/scripts/generator/cpp/__init__.py
diff --git a/ext/googlemock/scripts/generator/cpp/ast.py b/ext/googletest/googlemock/scripts/generator/cpp/ast.py
index 11cbe9126..11cbe9126 100755
--- a/ext/googlemock/scripts/generator/cpp/ast.py
+++ b/ext/googletest/googlemock/scripts/generator/cpp/ast.py
diff --git a/ext/googlemock/scripts/generator/cpp/gmock_class.py b/ext/googletest/googlemock/scripts/generator/cpp/gmock_class.py
index f9966cbb4..f9966cbb4 100755
--- a/ext/googlemock/scripts/generator/cpp/gmock_class.py
+++ b/ext/googletest/googlemock/scripts/generator/cpp/gmock_class.py
diff --git a/ext/googlemock/scripts/generator/cpp/gmock_class_test.py b/ext/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py
index 018f90a65..018f90a65 100755
--- a/ext/googlemock/scripts/generator/cpp/gmock_class_test.py
+++ b/ext/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py
diff --git a/ext/googlemock/scripts/generator/cpp/keywords.py b/ext/googletest/googlemock/scripts/generator/cpp/keywords.py
index f694450e3..f694450e3 100755
--- a/ext/googlemock/scripts/generator/cpp/keywords.py
+++ b/ext/googletest/googlemock/scripts/generator/cpp/keywords.py
diff --git a/ext/googlemock/scripts/generator/cpp/tokenize.py b/ext/googletest/googlemock/scripts/generator/cpp/tokenize.py
index 359d5562d..359d5562d 100755
--- a/ext/googlemock/scripts/generator/cpp/tokenize.py
+++ b/ext/googletest/googlemock/scripts/generator/cpp/tokenize.py
diff --git a/ext/googlemock/scripts/generator/cpp/utils.py b/ext/googletest/googlemock/scripts/generator/cpp/utils.py
index eab36eec3..eab36eec3 100755
--- a/ext/googlemock/scripts/generator/cpp/utils.py
+++ b/ext/googletest/googlemock/scripts/generator/cpp/utils.py
diff --git a/ext/googlemock/scripts/generator/gmock_gen.py b/ext/googletest/googlemock/scripts/generator/gmock_gen.py
index 8cc0d135d..8cc0d135d 100755
--- a/ext/googlemock/scripts/generator/gmock_gen.py
+++ b/ext/googletest/googlemock/scripts/generator/gmock_gen.py
diff --git a/ext/googlemock/scripts/gmock-config.in b/ext/googletest/googlemock/scripts/gmock-config.in
index 2baefe94d..2baefe94d 100755
--- a/ext/googlemock/scripts/gmock-config.in
+++ b/ext/googletest/googlemock/scripts/gmock-config.in
diff --git a/ext/googlemock/scripts/gmock_doctor.py b/ext/googletest/googlemock/scripts/gmock_doctor.py
index 74992bc74..74992bc74 100755
--- a/ext/googlemock/scripts/gmock_doctor.py
+++ b/ext/googletest/googlemock/scripts/gmock_doctor.py
diff --git a/ext/googlemock/scripts/upload.py b/ext/googletest/googlemock/scripts/upload.py
index 6e6f9a147..6e6f9a147 100755
--- a/ext/googlemock/scripts/upload.py
+++ b/ext/googletest/googlemock/scripts/upload.py
diff --git a/ext/googlemock/scripts/upload_gmock.py b/ext/googletest/googlemock/scripts/upload_gmock.py
index 5dc484b39..5dc484b39 100755
--- a/ext/googlemock/scripts/upload_gmock.py
+++ b/ext/googletest/googlemock/scripts/upload_gmock.py
diff --git a/ext/googlemock/src/gmock-all.cc b/ext/googletest/googlemock/src/gmock-all.cc
index 7aebce7af..7aebce7af 100644
--- a/ext/googlemock/src/gmock-all.cc
+++ b/ext/googletest/googlemock/src/gmock-all.cc
diff --git a/ext/googlemock/src/gmock-cardinalities.cc b/ext/googletest/googlemock/src/gmock-cardinalities.cc
index 50ec7286e..50ec7286e 100644
--- a/ext/googlemock/src/gmock-cardinalities.cc
+++ b/ext/googletest/googlemock/src/gmock-cardinalities.cc
diff --git a/ext/googlemock/src/gmock-internal-utils.cc b/ext/googletest/googlemock/src/gmock-internal-utils.cc
index fb5308018..fb5308018 100644
--- a/ext/googlemock/src/gmock-internal-utils.cc
+++ b/ext/googletest/googlemock/src/gmock-internal-utils.cc
diff --git a/ext/googlemock/src/gmock-matchers.cc b/ext/googletest/googlemock/src/gmock-matchers.cc
index e7424510f..e7424510f 100644
--- a/ext/googlemock/src/gmock-matchers.cc
+++ b/ext/googletest/googlemock/src/gmock-matchers.cc
diff --git a/ext/googlemock/src/gmock-spec-builders.cc b/ext/googletest/googlemock/src/gmock-spec-builders.cc
index 955134207..955134207 100644
--- a/ext/googlemock/src/gmock-spec-builders.cc
+++ b/ext/googletest/googlemock/src/gmock-spec-builders.cc
diff --git a/ext/googlemock/src/gmock.cc b/ext/googletest/googlemock/src/gmock.cc
index eac3d842b..eac3d842b 100644
--- a/ext/googlemock/src/gmock.cc
+++ b/ext/googletest/googlemock/src/gmock.cc
diff --git a/ext/googlemock/src/gmock_main.cc b/ext/googletest/googlemock/src/gmock_main.cc
index bd5be03be..bd5be03be 100644
--- a/ext/googlemock/src/gmock_main.cc
+++ b/ext/googletest/googlemock/src/gmock_main.cc
diff --git a/ext/googlemock/test/gmock-actions_test.cc b/ext/googletest/googlemock/test/gmock-actions_test.cc
index f470de4c5..f470de4c5 100644
--- a/ext/googlemock/test/gmock-actions_test.cc
+++ b/ext/googletest/googlemock/test/gmock-actions_test.cc
diff --git a/ext/googlemock/test/gmock-cardinalities_test.cc b/ext/googletest/googlemock/test/gmock-cardinalities_test.cc
index 64815e57a..64815e57a 100644
--- a/ext/googlemock/test/gmock-cardinalities_test.cc
+++ b/ext/googletest/googlemock/test/gmock-cardinalities_test.cc
diff --git a/ext/googlemock/test/gmock-generated-actions_test.cc b/ext/googletest/googlemock/test/gmock-generated-actions_test.cc
index 5ca5bc789..5ca5bc789 100644
--- a/ext/googlemock/test/gmock-generated-actions_test.cc
+++ b/ext/googletest/googlemock/test/gmock-generated-actions_test.cc
diff --git a/ext/googlemock/test/gmock-generated-function-mockers_test.cc b/ext/googletest/googlemock/test/gmock-generated-function-mockers_test.cc
index a86a61357..a86a61357 100644
--- a/ext/googlemock/test/gmock-generated-function-mockers_test.cc
+++ b/ext/googletest/googlemock/test/gmock-generated-function-mockers_test.cc
diff --git a/ext/googlemock/test/gmock-generated-internal-utils_test.cc b/ext/googletest/googlemock/test/gmock-generated-internal-utils_test.cc
index e0a535a34..e0a535a34 100644
--- a/ext/googlemock/test/gmock-generated-internal-utils_test.cc
+++ b/ext/googletest/googlemock/test/gmock-generated-internal-utils_test.cc
diff --git a/ext/googlemock/test/gmock-generated-matchers_test.cc b/ext/googletest/googlemock/test/gmock-generated-matchers_test.cc
index 0e9f77f5e..0e9f77f5e 100644
--- a/ext/googlemock/test/gmock-generated-matchers_test.cc
+++ b/ext/googletest/googlemock/test/gmock-generated-matchers_test.cc
diff --git a/ext/googlemock/test/gmock-internal-utils_test.cc b/ext/googletest/googlemock/test/gmock-internal-utils_test.cc
index 9d5ec6092..9d5ec6092 100644
--- a/ext/googlemock/test/gmock-internal-utils_test.cc
+++ b/ext/googletest/googlemock/test/gmock-internal-utils_test.cc
diff --git a/ext/googlemock/test/gmock-matchers_test.cc b/ext/googletest/googlemock/test/gmock-matchers_test.cc
index 9f62c3d82..9f62c3d82 100644
--- a/ext/googlemock/test/gmock-matchers_test.cc
+++ b/ext/googletest/googlemock/test/gmock-matchers_test.cc
diff --git a/ext/googlemock/test/gmock-more-actions_test.cc b/ext/googletest/googlemock/test/gmock-more-actions_test.cc
index 77e15bd58..77e15bd58 100644
--- a/ext/googlemock/test/gmock-more-actions_test.cc
+++ b/ext/googletest/googlemock/test/gmock-more-actions_test.cc
diff --git a/ext/googlemock/test/gmock-nice-strict_test.cc b/ext/googletest/googlemock/test/gmock-nice-strict_test.cc
index d0adcbbed..d0adcbbed 100644
--- a/ext/googlemock/test/gmock-nice-strict_test.cc
+++ b/ext/googletest/googlemock/test/gmock-nice-strict_test.cc
diff --git a/ext/googlemock/test/gmock-port_test.cc b/ext/googletest/googlemock/test/gmock-port_test.cc
index d6a8d4446..d6a8d4446 100644
--- a/ext/googlemock/test/gmock-port_test.cc
+++ b/ext/googletest/googlemock/test/gmock-port_test.cc
diff --git a/ext/googlemock/test/gmock-spec-builders_test.cc b/ext/googletest/googlemock/test/gmock-spec-builders_test.cc
index 59ea87c89..59ea87c89 100644
--- a/ext/googlemock/test/gmock-spec-builders_test.cc
+++ b/ext/googletest/googlemock/test/gmock-spec-builders_test.cc
diff --git a/ext/googlemock/test/gmock_all_test.cc b/ext/googletest/googlemock/test/gmock_all_test.cc
index 56d6c49cc..56d6c49cc 100644
--- a/ext/googlemock/test/gmock_all_test.cc
+++ b/ext/googletest/googlemock/test/gmock_all_test.cc
diff --git a/ext/googlemock/test/gmock_ex_test.cc b/ext/googletest/googlemock/test/gmock_ex_test.cc
index 3afed86ab..3afed86ab 100644
--- a/ext/googlemock/test/gmock_ex_test.cc
+++ b/ext/googletest/googlemock/test/gmock_ex_test.cc
diff --git a/ext/googlemock/test/gmock_leak_test.py b/ext/googletest/googlemock/test/gmock_leak_test.py
index 997680ce1..997680ce1 100755
--- a/ext/googlemock/test/gmock_leak_test.py
+++ b/ext/googletest/googlemock/test/gmock_leak_test.py
diff --git a/ext/googlemock/test/gmock_leak_test_.cc b/ext/googletest/googlemock/test/gmock_leak_test_.cc
index 1d27d22f6..1d27d22f6 100644
--- a/ext/googlemock/test/gmock_leak_test_.cc
+++ b/ext/googletest/googlemock/test/gmock_leak_test_.cc
diff --git a/ext/googlemock/test/gmock_link2_test.cc b/ext/googletest/googlemock/test/gmock_link2_test.cc
index 4c310c3d8..4c310c3d8 100644
--- a/ext/googlemock/test/gmock_link2_test.cc
+++ b/ext/googletest/googlemock/test/gmock_link2_test.cc
diff --git a/ext/googlemock/test/gmock_link_test.cc b/ext/googletest/googlemock/test/gmock_link_test.cc
index 61e97d10c..61e97d10c 100644
--- a/ext/googlemock/test/gmock_link_test.cc
+++ b/ext/googletest/googlemock/test/gmock_link_test.cc
diff --git a/ext/googlemock/test/gmock_link_test.h b/ext/googletest/googlemock/test/gmock_link_test.h
index 1f55f5bd7..1f55f5bd7 100644
--- a/ext/googlemock/test/gmock_link_test.h
+++ b/ext/googletest/googlemock/test/gmock_link_test.h
diff --git a/ext/googlemock/test/gmock_output_test.py b/ext/googletest/googlemock/test/gmock_output_test.py
index eced8a81f..eced8a81f 100755
--- a/ext/googlemock/test/gmock_output_test.py
+++ b/ext/googletest/googlemock/test/gmock_output_test.py
diff --git a/ext/googlemock/test/gmock_output_test_.cc b/ext/googletest/googlemock/test/gmock_output_test_.cc
index 44cba342a..44cba342a 100644
--- a/ext/googlemock/test/gmock_output_test_.cc
+++ b/ext/googletest/googlemock/test/gmock_output_test_.cc
diff --git a/ext/googlemock/test/gmock_output_test_golden.txt b/ext/googletest/googlemock/test/gmock_output_test_golden.txt
index 689d5eeb0..689d5eeb0 100644
--- a/ext/googlemock/test/gmock_output_test_golden.txt
+++ b/ext/googletest/googlemock/test/gmock_output_test_golden.txt
diff --git a/ext/googlemock/test/gmock_stress_test.cc b/ext/googletest/googlemock/test/gmock_stress_test.cc
index 0e97aeed0..0e97aeed0 100644
--- a/ext/googlemock/test/gmock_stress_test.cc
+++ b/ext/googletest/googlemock/test/gmock_stress_test.cc
diff --git a/ext/googlemock/test/gmock_test.cc b/ext/googletest/googlemock/test/gmock_test.cc
index d8d0c57b1..d8d0c57b1 100644
--- a/ext/googlemock/test/gmock_test.cc
+++ b/ext/googletest/googlemock/test/gmock_test.cc
diff --git a/ext/googlemock/test/gmock_test_utils.py b/ext/googletest/googlemock/test/gmock_test_utils.py
index 20e3d3d44..20e3d3d44 100755
--- a/ext/googlemock/test/gmock_test_utils.py
+++ b/ext/googletest/googlemock/test/gmock_test_utils.py
diff --git a/ext/googletest/.gitignore b/ext/googletest/googletest/.gitignore
index 4b7be4b91..4b7be4b91 100644
--- a/ext/googletest/.gitignore
+++ b/ext/googletest/googletest/.gitignore
diff --git a/ext/googletest/CHANGES b/ext/googletest/googletest/CHANGES
index 055213242..055213242 100644
--- a/ext/googletest/CHANGES
+++ b/ext/googletest/googletest/CHANGES
diff --git a/ext/googletest/CMakeLists.txt b/ext/googletest/googletest/CMakeLists.txt
index 621d0f042..621d0f042 100644
--- a/ext/googletest/CMakeLists.txt
+++ b/ext/googletest/googletest/CMakeLists.txt
diff --git a/ext/googletest/CONTRIBUTORS b/ext/googletest/googletest/CONTRIBUTORS
index feae2fc04..feae2fc04 100644
--- a/ext/googletest/CONTRIBUTORS
+++ b/ext/googletest/googletest/CONTRIBUTORS
diff --git a/ext/googletest/LICENSE b/ext/googletest/googletest/LICENSE
index 1941a11f8..1941a11f8 100644
--- a/ext/googletest/LICENSE
+++ b/ext/googletest/googletest/LICENSE
diff --git a/ext/googletest/Makefile.am b/ext/googletest/googletest/Makefile.am
index 29797e4e9..29797e4e9 100644
--- a/ext/googletest/Makefile.am
+++ b/ext/googletest/googletest/Makefile.am
diff --git a/ext/googletest/README.md b/ext/googletest/googletest/README.md
index edd440805..edd440805 100644
--- a/ext/googletest/README.md
+++ b/ext/googletest/googletest/README.md
diff --git a/ext/googletest/build-aux/.keep b/ext/googletest/googletest/build-aux/.keep
index e69de29bb..e69de29bb 100644
--- a/ext/googletest/build-aux/.keep
+++ b/ext/googletest/googletest/build-aux/.keep
diff --git a/ext/googletest/cmake/internal_utils.cmake b/ext/googletest/googletest/cmake/internal_utils.cmake
index 777b91ed4..777b91ed4 100644
--- a/ext/googletest/cmake/internal_utils.cmake
+++ b/ext/googletest/googletest/cmake/internal_utils.cmake
diff --git a/ext/googletest/codegear/gtest.cbproj b/ext/googletest/googletest/codegear/gtest.cbproj
index 95c3054b8..95c3054b8 100644
--- a/ext/googletest/codegear/gtest.cbproj
+++ b/ext/googletest/googletest/codegear/gtest.cbproj
diff --git a/ext/googletest/codegear/gtest.groupproj b/ext/googletest/googletest/codegear/gtest.groupproj
index faf31cab6..faf31cab6 100644
--- a/ext/googletest/codegear/gtest.groupproj
+++ b/ext/googletest/googletest/codegear/gtest.groupproj
diff --git a/ext/googletest/codegear/gtest_all.cc b/ext/googletest/googletest/codegear/gtest_all.cc
index 121b2d80e..121b2d80e 100644
--- a/ext/googletest/codegear/gtest_all.cc
+++ b/ext/googletest/googletest/codegear/gtest_all.cc
diff --git a/ext/googletest/codegear/gtest_link.cc b/ext/googletest/googletest/codegear/gtest_link.cc
index 918eccd19..918eccd19 100644
--- a/ext/googletest/codegear/gtest_link.cc
+++ b/ext/googletest/googletest/codegear/gtest_link.cc
diff --git a/ext/googletest/codegear/gtest_main.cbproj b/ext/googletest/googletest/codegear/gtest_main.cbproj
index d76ce1398..d76ce1398 100644
--- a/ext/googletest/codegear/gtest_main.cbproj
+++ b/ext/googletest/googletest/codegear/gtest_main.cbproj
diff --git a/ext/googletest/codegear/gtest_unittest.cbproj b/ext/googletest/googletest/codegear/gtest_unittest.cbproj
index dc5db8e4d..dc5db8e4d 100644
--- a/ext/googletest/codegear/gtest_unittest.cbproj
+++ b/ext/googletest/googletest/codegear/gtest_unittest.cbproj
diff --git a/ext/googletest/configure.ac b/ext/googletest/googletest/configure.ac
index cc592e158..cc592e158 100644
--- a/ext/googletest/configure.ac
+++ b/ext/googletest/googletest/configure.ac
diff --git a/ext/googletest/docs/AdvancedGuide.md b/ext/googletest/googletest/docs/AdvancedGuide.md
index 93a65200d..93a65200d 100644
--- a/ext/googletest/docs/AdvancedGuide.md
+++ b/ext/googletest/googletest/docs/AdvancedGuide.md
diff --git a/ext/googletest/docs/DevGuide.md b/ext/googletest/googletest/docs/DevGuide.md
index 06467a327..06467a327 100644
--- a/ext/googletest/docs/DevGuide.md
+++ b/ext/googletest/googletest/docs/DevGuide.md
diff --git a/ext/googletest/docs/Documentation.md b/ext/googletest/googletest/docs/Documentation.md
index 8ca1aac75..8ca1aac75 100644
--- a/ext/googletest/docs/Documentation.md
+++ b/ext/googletest/googletest/docs/Documentation.md
diff --git a/ext/googletest/docs/FAQ.md b/ext/googletest/googletest/docs/FAQ.md
index 5fd6cb723..5fd6cb723 100644
--- a/ext/googletest/docs/FAQ.md
+++ b/ext/googletest/googletest/docs/FAQ.md
diff --git a/ext/googletest/docs/Primer.md b/ext/googletest/googletest/docs/Primer.md
index 474c1d2ab..474c1d2ab 100644
--- a/ext/googletest/docs/Primer.md
+++ b/ext/googletest/googletest/docs/Primer.md
diff --git a/ext/googletest/docs/PumpManual.md b/ext/googletest/googletest/docs/PumpManual.md
index 8184f153c..8184f153c 100644
--- a/ext/googletest/docs/PumpManual.md
+++ b/ext/googletest/googletest/docs/PumpManual.md
diff --git a/ext/googletest/docs/Samples.md b/ext/googletest/googletest/docs/Samples.md
index f21d20056..f21d20056 100644
--- a/ext/googletest/docs/Samples.md
+++ b/ext/googletest/googletest/docs/Samples.md
diff --git a/ext/googletest/docs/V1_5_AdvancedGuide.md b/ext/googletest/googletest/docs/V1_5_AdvancedGuide.md
index 34e19c26f..34e19c26f 100644
--- a/ext/googletest/docs/V1_5_AdvancedGuide.md
+++ b/ext/googletest/googletest/docs/V1_5_AdvancedGuide.md
diff --git a/ext/googletest/docs/V1_5_Documentation.md b/ext/googletest/googletest/docs/V1_5_Documentation.md
index 46bba2ec8..46bba2ec8 100644
--- a/ext/googletest/docs/V1_5_Documentation.md
+++ b/ext/googletest/googletest/docs/V1_5_Documentation.md
diff --git a/ext/googletest/docs/V1_5_FAQ.md b/ext/googletest/googletest/docs/V1_5_FAQ.md
index e870aff00..e870aff00 100644
--- a/ext/googletest/docs/V1_5_FAQ.md
+++ b/ext/googletest/googletest/docs/V1_5_FAQ.md
diff --git a/ext/googletest/docs/V1_5_Primer.md b/ext/googletest/googletest/docs/V1_5_Primer.md
index 6960d2ce4..6960d2ce4 100644
--- a/ext/googletest/docs/V1_5_Primer.md
+++ b/ext/googletest/googletest/docs/V1_5_Primer.md
diff --git a/ext/googletest/docs/V1_5_PumpManual.md b/ext/googletest/googletest/docs/V1_5_PumpManual.md
index 15710789d..15710789d 100644
--- a/ext/googletest/docs/V1_5_PumpManual.md
+++ b/ext/googletest/googletest/docs/V1_5_PumpManual.md
diff --git a/ext/googletest/docs/V1_5_XcodeGuide.md b/ext/googletest/googletest/docs/V1_5_XcodeGuide.md
index bf24bf51b..bf24bf51b 100644
--- a/ext/googletest/docs/V1_5_XcodeGuide.md
+++ b/ext/googletest/googletest/docs/V1_5_XcodeGuide.md
diff --git a/ext/googletest/docs/V1_6_AdvancedGuide.md b/ext/googletest/googletest/docs/V1_6_AdvancedGuide.md
index 78864b166..78864b166 100644
--- a/ext/googletest/docs/V1_6_AdvancedGuide.md
+++ b/ext/googletest/googletest/docs/V1_6_AdvancedGuide.md
diff --git a/ext/googletest/docs/V1_6_Documentation.md b/ext/googletest/googletest/docs/V1_6_Documentation.md
index ca924660a..ca924660a 100644
--- a/ext/googletest/docs/V1_6_Documentation.md
+++ b/ext/googletest/googletest/docs/V1_6_Documentation.md
diff --git a/ext/googletest/docs/V1_6_FAQ.md b/ext/googletest/googletest/docs/V1_6_FAQ.md
index 2b7f78407..2b7f78407 100644
--- a/ext/googletest/docs/V1_6_FAQ.md
+++ b/ext/googletest/googletest/docs/V1_6_FAQ.md
diff --git a/ext/googletest/docs/V1_6_Primer.md b/ext/googletest/googletest/docs/V1_6_Primer.md
index 8d840ef45..8d840ef45 100644
--- a/ext/googletest/docs/V1_6_Primer.md
+++ b/ext/googletest/googletest/docs/V1_6_Primer.md
diff --git a/ext/googletest/docs/V1_6_PumpManual.md b/ext/googletest/googletest/docs/V1_6_PumpManual.md
index 8184f153c..8184f153c 100644
--- a/ext/googletest/docs/V1_6_PumpManual.md
+++ b/ext/googletest/googletest/docs/V1_6_PumpManual.md
diff --git a/ext/googletest/docs/V1_6_Samples.md b/ext/googletest/googletest/docs/V1_6_Samples.md
index f21d20056..f21d20056 100644
--- a/ext/googletest/docs/V1_6_Samples.md
+++ b/ext/googletest/googletest/docs/V1_6_Samples.md
diff --git a/ext/googletest/docs/V1_6_XcodeGuide.md b/ext/googletest/googletest/docs/V1_6_XcodeGuide.md
index bf24bf51b..bf24bf51b 100644
--- a/ext/googletest/docs/V1_6_XcodeGuide.md
+++ b/ext/googletest/googletest/docs/V1_6_XcodeGuide.md
diff --git a/ext/googletest/docs/V1_7_AdvancedGuide.md b/ext/googletest/googletest/docs/V1_7_AdvancedGuide.md
index dd4af8f36..dd4af8f36 100644
--- a/ext/googletest/docs/V1_7_AdvancedGuide.md
+++ b/ext/googletest/googletest/docs/V1_7_AdvancedGuide.md
diff --git a/ext/googletest/docs/V1_7_Documentation.md b/ext/googletest/googletest/docs/V1_7_Documentation.md
index 282697a50..282697a50 100644
--- a/ext/googletest/docs/V1_7_Documentation.md
+++ b/ext/googletest/googletest/docs/V1_7_Documentation.md
diff --git a/ext/googletest/docs/V1_7_FAQ.md b/ext/googletest/googletest/docs/V1_7_FAQ.md
index 3dd914dcf..3dd914dcf 100644
--- a/ext/googletest/docs/V1_7_FAQ.md
+++ b/ext/googletest/googletest/docs/V1_7_FAQ.md
diff --git a/ext/googletest/docs/V1_7_Primer.md b/ext/googletest/googletest/docs/V1_7_Primer.md
index b1827c735..b1827c735 100644
--- a/ext/googletest/docs/V1_7_Primer.md
+++ b/ext/googletest/googletest/docs/V1_7_Primer.md
diff --git a/ext/googletest/docs/V1_7_PumpManual.md b/ext/googletest/googletest/docs/V1_7_PumpManual.md
index 8184f153c..8184f153c 100644
--- a/ext/googletest/docs/V1_7_PumpManual.md
+++ b/ext/googletest/googletest/docs/V1_7_PumpManual.md
diff --git a/ext/googletest/docs/V1_7_Samples.md b/ext/googletest/googletest/docs/V1_7_Samples.md
index f21d20056..f21d20056 100644
--- a/ext/googletest/docs/V1_7_Samples.md
+++ b/ext/googletest/googletest/docs/V1_7_Samples.md
diff --git a/ext/googletest/docs/V1_7_XcodeGuide.md b/ext/googletest/googletest/docs/V1_7_XcodeGuide.md
index bf24bf51b..bf24bf51b 100644
--- a/ext/googletest/docs/V1_7_XcodeGuide.md
+++ b/ext/googletest/googletest/docs/V1_7_XcodeGuide.md
diff --git a/ext/googletest/docs/XcodeGuide.md b/ext/googletest/googletest/docs/XcodeGuide.md
index bf24bf51b..bf24bf51b 100644
--- a/ext/googletest/docs/XcodeGuide.md
+++ b/ext/googletest/googletest/docs/XcodeGuide.md
diff --git a/ext/googletest/include/gtest/gtest-death-test.h b/ext/googletest/googletest/include/gtest/gtest-death-test.h
index 957a69c6a..957a69c6a 100644
--- a/ext/googletest/include/gtest/gtest-death-test.h
+++ b/ext/googletest/googletest/include/gtest/gtest-death-test.h
diff --git a/ext/googletest/include/gtest/gtest-message.h b/ext/googletest/googletest/include/gtest/gtest-message.h
index fe879bca7..fe879bca7 100644
--- a/ext/googletest/include/gtest/gtest-message.h
+++ b/ext/googletest/googletest/include/gtest/gtest-message.h
diff --git a/ext/googletest/include/gtest/gtest-param-test.h b/ext/googletest/googletest/include/gtest/gtest-param-test.h
index 038f9ba79..038f9ba79 100644
--- a/ext/googletest/include/gtest/gtest-param-test.h
+++ b/ext/googletest/googletest/include/gtest/gtest-param-test.h
diff --git a/ext/googletest/include/gtest/gtest-param-test.h.pump b/ext/googletest/googletest/include/gtest/gtest-param-test.h.pump
index 3078d6d2a..3078d6d2a 100644
--- a/ext/googletest/include/gtest/gtest-param-test.h.pump
+++ b/ext/googletest/googletest/include/gtest/gtest-param-test.h.pump
diff --git a/ext/googletest/include/gtest/gtest-printers.h b/ext/googletest/googletest/include/gtest/gtest-printers.h
index 8a33164cb..8a33164cb 100644
--- a/ext/googletest/include/gtest/gtest-printers.h
+++ b/ext/googletest/googletest/include/gtest/gtest-printers.h
diff --git a/ext/googletest/include/gtest/gtest-spi.h b/ext/googletest/googletest/include/gtest/gtest-spi.h
index f63fa9a1b..f63fa9a1b 100644
--- a/ext/googletest/include/gtest/gtest-spi.h
+++ b/ext/googletest/googletest/include/gtest/gtest-spi.h
diff --git a/ext/googletest/include/gtest/gtest-test-part.h b/ext/googletest/googletest/include/gtest/gtest-test-part.h
index 77eb84483..77eb84483 100644
--- a/ext/googletest/include/gtest/gtest-test-part.h
+++ b/ext/googletest/googletest/include/gtest/gtest-test-part.h
diff --git a/ext/googletest/include/gtest/gtest-typed-test.h b/ext/googletest/googletest/include/gtest/gtest-typed-test.h
index 5f69d5678..5f69d5678 100644
--- a/ext/googletest/include/gtest/gtest-typed-test.h
+++ b/ext/googletest/googletest/include/gtest/gtest-typed-test.h
diff --git a/ext/googletest/include/gtest/gtest.h b/ext/googletest/googletest/include/gtest/gtest.h
index f846c5bd6..f846c5bd6 100644
--- a/ext/googletest/include/gtest/gtest.h
+++ b/ext/googletest/googletest/include/gtest/gtest.h
diff --git a/ext/googletest/include/gtest/gtest_pred_impl.h b/ext/googletest/googletest/include/gtest/gtest_pred_impl.h
index 30ae712f5..30ae712f5 100644
--- a/ext/googletest/include/gtest/gtest_pred_impl.h
+++ b/ext/googletest/googletest/include/gtest/gtest_pred_impl.h
diff --git a/ext/googletest/include/gtest/gtest_prod.h b/ext/googletest/googletest/include/gtest/gtest_prod.h
index da80ddc6c..da80ddc6c 100644
--- a/ext/googletest/include/gtest/gtest_prod.h
+++ b/ext/googletest/googletest/include/gtest/gtest_prod.h
diff --git a/ext/googletest/include/gtest/internal/custom/gtest-port.h b/ext/googletest/googletest/include/gtest/internal/custom/gtest-port.h
index 7e744bd3b..7e744bd3b 100644
--- a/ext/googletest/include/gtest/internal/custom/gtest-port.h
+++ b/ext/googletest/googletest/include/gtest/internal/custom/gtest-port.h
diff --git a/ext/googletest/include/gtest/internal/custom/gtest-printers.h b/ext/googletest/googletest/include/gtest/internal/custom/gtest-printers.h
index 60c1ea050..60c1ea050 100644
--- a/ext/googletest/include/gtest/internal/custom/gtest-printers.h
+++ b/ext/googletest/googletest/include/gtest/internal/custom/gtest-printers.h
diff --git a/ext/googletest/include/gtest/internal/custom/gtest.h b/ext/googletest/googletest/include/gtest/internal/custom/gtest.h
index c27412a89..c27412a89 100644
--- a/ext/googletest/include/gtest/internal/custom/gtest.h
+++ b/ext/googletest/googletest/include/gtest/internal/custom/gtest.h
diff --git a/ext/googletest/include/gtest/internal/gtest-death-test-internal.h b/ext/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h
index 2b3a78f5b..2b3a78f5b 100644
--- a/ext/googletest/include/gtest/internal/gtest-death-test-internal.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/ext/googletest/include/gtest/internal/gtest-filepath.h b/ext/googletest/googletest/include/gtest/internal/gtest-filepath.h
index 7a13b4b0d..7a13b4b0d 100644
--- a/ext/googletest/include/gtest/internal/gtest-filepath.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-filepath.h
diff --git a/ext/googletest/include/gtest/internal/gtest-internal.h b/ext/googletest/googletest/include/gtest/internal/gtest-internal.h
index ebd1cf615..ebd1cf615 100644
--- a/ext/googletest/include/gtest/internal/gtest-internal.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-internal.h
diff --git a/ext/googletest/include/gtest/internal/gtest-linked_ptr.h b/ext/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h
index 360294221..360294221 100644
--- a/ext/googletest/include/gtest/internal/gtest-linked_ptr.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/ext/googletest/include/gtest/internal/gtest-param-util-generated.h b/ext/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h
index 4d1d81d20..4d1d81d20 100644
--- a/ext/googletest/include/gtest/internal/gtest-param-util-generated.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/ext/googletest/include/gtest/internal/gtest-param-util-generated.h.pump b/ext/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
index 5c7c47af0..5c7c47af0 100644
--- a/ext/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/ext/googletest/include/gtest/internal/gtest-param-util.h b/ext/googletest/googletest/include/gtest/internal/gtest-param-util.h
index 82cab9b02..82cab9b02 100644
--- a/ext/googletest/include/gtest/internal/gtest-param-util.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-param-util.h
diff --git a/ext/googletest/include/gtest/internal/gtest-port-arch.h b/ext/googletest/googletest/include/gtest/internal/gtest-port-arch.h
index 74ab94905..74ab94905 100644
--- a/ext/googletest/include/gtest/internal/gtest-port-arch.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-port-arch.h
diff --git a/ext/googletest/include/gtest/internal/gtest-port.h b/ext/googletest/googletest/include/gtest/internal/gtest-port.h
index 0094ed507..0094ed507 100644
--- a/ext/googletest/include/gtest/internal/gtest-port.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-port.h
diff --git a/ext/googletest/include/gtest/internal/gtest-string.h b/ext/googletest/googletest/include/gtest/internal/gtest-string.h
index 97f1a7fdd..97f1a7fdd 100644
--- a/ext/googletest/include/gtest/internal/gtest-string.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-string.h
diff --git a/ext/googletest/include/gtest/internal/gtest-tuple.h b/ext/googletest/googletest/include/gtest/internal/gtest-tuple.h
index e9b405340..e9b405340 100644
--- a/ext/googletest/include/gtest/internal/gtest-tuple.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-tuple.h
diff --git a/ext/googletest/include/gtest/internal/gtest-tuple.h.pump b/ext/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump
index 429ddfeec..429ddfeec 100644
--- a/ext/googletest/include/gtest/internal/gtest-tuple.h.pump
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/ext/googletest/include/gtest/internal/gtest-type-util.h b/ext/googletest/googletest/include/gtest/internal/gtest-type-util.h
index e46f7cfcb..e46f7cfcb 100644
--- a/ext/googletest/include/gtest/internal/gtest-type-util.h
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-type-util.h
diff --git a/ext/googletest/include/gtest/internal/gtest-type-util.h.pump b/ext/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump
index 251fdf025..251fdf025 100644
--- a/ext/googletest/include/gtest/internal/gtest-type-util.h.pump
+++ b/ext/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/ext/googletest/m4/acx_pthread.m4 b/ext/googletest/googletest/m4/acx_pthread.m4
index 2cf20de14..2cf20de14 100644
--- a/ext/googletest/m4/acx_pthread.m4
+++ b/ext/googletest/googletest/m4/acx_pthread.m4
diff --git a/ext/googletest/m4/gtest.m4 b/ext/googletest/googletest/m4/gtest.m4
index 6598ba75a..6598ba75a 100644
--- a/ext/googletest/m4/gtest.m4
+++ b/ext/googletest/googletest/m4/gtest.m4
diff --git a/ext/googletest/make/Makefile b/ext/googletest/googletest/make/Makefile
index 9ac74493b..9ac74493b 100644
--- a/ext/googletest/make/Makefile
+++ b/ext/googletest/googletest/make/Makefile
diff --git a/ext/googletest/msvc/gtest-md.sln b/ext/googletest/googletest/msvc/gtest-md.sln
index f7908da11..f7908da11 100644
--- a/ext/googletest/msvc/gtest-md.sln
+++ b/ext/googletest/googletest/msvc/gtest-md.sln
diff --git a/ext/googletest/msvc/gtest-md.vcproj b/ext/googletest/googletest/msvc/gtest-md.vcproj
index 1c35c3a5e..1c35c3a5e 100644
--- a/ext/googletest/msvc/gtest-md.vcproj
+++ b/ext/googletest/googletest/msvc/gtest-md.vcproj
diff --git a/ext/googletest/msvc/gtest.sln b/ext/googletest/googletest/msvc/gtest.sln
index ef4b057ff..ef4b057ff 100644
--- a/ext/googletest/msvc/gtest.sln
+++ b/ext/googletest/googletest/msvc/gtest.sln
diff --git a/ext/googletest/msvc/gtest.vcproj b/ext/googletest/googletest/msvc/gtest.vcproj
index a8373ce9a..a8373ce9a 100644
--- a/ext/googletest/msvc/gtest.vcproj
+++ b/ext/googletest/googletest/msvc/gtest.vcproj
diff --git a/ext/googletest/msvc/gtest_main-md.vcproj b/ext/googletest/googletest/msvc/gtest_main-md.vcproj
index b5379fe61..b5379fe61 100644
--- a/ext/googletest/msvc/gtest_main-md.vcproj
+++ b/ext/googletest/googletest/msvc/gtest_main-md.vcproj
diff --git a/ext/googletest/msvc/gtest_main.vcproj b/ext/googletest/googletest/msvc/gtest_main.vcproj
index e8b763c56..e8b763c56 100644
--- a/ext/googletest/msvc/gtest_main.vcproj
+++ b/ext/googletest/googletest/msvc/gtest_main.vcproj
diff --git a/ext/googletest/msvc/gtest_prod_test-md.vcproj b/ext/googletest/googletest/msvc/gtest_prod_test-md.vcproj
index 05b05d9ed..05b05d9ed 100644
--- a/ext/googletest/msvc/gtest_prod_test-md.vcproj
+++ b/ext/googletest/googletest/msvc/gtest_prod_test-md.vcproj
diff --git a/ext/googletest/msvc/gtest_prod_test.vcproj b/ext/googletest/googletest/msvc/gtest_prod_test.vcproj
index 6d7a2f021..6d7a2f021 100644
--- a/ext/googletest/msvc/gtest_prod_test.vcproj
+++ b/ext/googletest/googletest/msvc/gtest_prod_test.vcproj
diff --git a/ext/googletest/msvc/gtest_unittest-md.vcproj b/ext/googletest/googletest/msvc/gtest_unittest-md.vcproj
index 38a5e5663..38a5e5663 100644
--- a/ext/googletest/msvc/gtest_unittest-md.vcproj
+++ b/ext/googletest/googletest/msvc/gtest_unittest-md.vcproj
diff --git a/ext/googletest/msvc/gtest_unittest.vcproj b/ext/googletest/googletest/msvc/gtest_unittest.vcproj
index cb1f52b1f..cb1f52b1f 100644
--- a/ext/googletest/msvc/gtest_unittest.vcproj
+++ b/ext/googletest/googletest/msvc/gtest_unittest.vcproj
diff --git a/ext/googletest/samples/prime_tables.h b/ext/googletest/googletest/samples/prime_tables.h
index 92ce16a01..92ce16a01 100644
--- a/ext/googletest/samples/prime_tables.h
+++ b/ext/googletest/googletest/samples/prime_tables.h
diff --git a/ext/googletest/samples/sample1.cc b/ext/googletest/googletest/samples/sample1.cc
index f171e2609..f171e2609 100644
--- a/ext/googletest/samples/sample1.cc
+++ b/ext/googletest/googletest/samples/sample1.cc
diff --git a/ext/googletest/samples/sample1.h b/ext/googletest/googletest/samples/sample1.h
index 3dfeb98c4..3dfeb98c4 100644
--- a/ext/googletest/samples/sample1.h
+++ b/ext/googletest/googletest/samples/sample1.h
diff --git a/ext/googletest/samples/sample10_unittest.cc b/ext/googletest/googletest/samples/sample10_unittest.cc
index 0051cd5dc..0051cd5dc 100644
--- a/ext/googletest/samples/sample10_unittest.cc
+++ b/ext/googletest/googletest/samples/sample10_unittest.cc
diff --git a/ext/googletest/samples/sample1_unittest.cc b/ext/googletest/googletest/samples/sample1_unittest.cc
index aefc4f1d8..aefc4f1d8 100644
--- a/ext/googletest/samples/sample1_unittest.cc
+++ b/ext/googletest/googletest/samples/sample1_unittest.cc
diff --git a/ext/googletest/samples/sample2.cc b/ext/googletest/googletest/samples/sample2.cc
index 5f763b9bd..5f763b9bd 100644
--- a/ext/googletest/samples/sample2.cc
+++ b/ext/googletest/googletest/samples/sample2.cc
diff --git a/ext/googletest/samples/sample2.h b/ext/googletest/googletest/samples/sample2.h
index cb485c70f..cb485c70f 100644
--- a/ext/googletest/samples/sample2.h
+++ b/ext/googletest/googletest/samples/sample2.h
diff --git a/ext/googletest/samples/sample2_unittest.cc b/ext/googletest/googletest/samples/sample2_unittest.cc
index 4fa19b71c..4fa19b71c 100644
--- a/ext/googletest/samples/sample2_unittest.cc
+++ b/ext/googletest/googletest/samples/sample2_unittest.cc
diff --git a/ext/googletest/samples/sample3-inl.h b/ext/googletest/googletest/samples/sample3-inl.h
index 7e3084d63..7e3084d63 100644
--- a/ext/googletest/samples/sample3-inl.h
+++ b/ext/googletest/googletest/samples/sample3-inl.h
diff --git a/ext/googletest/samples/sample3_unittest.cc b/ext/googletest/googletest/samples/sample3_unittest.cc
index bf3877d01..bf3877d01 100644
--- a/ext/googletest/samples/sample3_unittest.cc
+++ b/ext/googletest/googletest/samples/sample3_unittest.cc
diff --git a/ext/googletest/samples/sample4.cc b/ext/googletest/googletest/samples/sample4.cc
index ae44bda6f..ae44bda6f 100644
--- a/ext/googletest/samples/sample4.cc
+++ b/ext/googletest/googletest/samples/sample4.cc
diff --git a/ext/googletest/samples/sample4.h b/ext/googletest/googletest/samples/sample4.h
index cd60f0dd2..cd60f0dd2 100644
--- a/ext/googletest/samples/sample4.h
+++ b/ext/googletest/googletest/samples/sample4.h
diff --git a/ext/googletest/samples/sample4_unittest.cc b/ext/googletest/googletest/samples/sample4_unittest.cc
index fa5afc7d5..fa5afc7d5 100644
--- a/ext/googletest/samples/sample4_unittest.cc
+++ b/ext/googletest/googletest/samples/sample4_unittest.cc
diff --git a/ext/googletest/samples/sample5_unittest.cc b/ext/googletest/googletest/samples/sample5_unittest.cc
index 43d8e5777..43d8e5777 100644
--- a/ext/googletest/samples/sample5_unittest.cc
+++ b/ext/googletest/googletest/samples/sample5_unittest.cc
diff --git a/ext/googletest/samples/sample6_unittest.cc b/ext/googletest/googletest/samples/sample6_unittest.cc
index 8f2036a51..8f2036a51 100644
--- a/ext/googletest/samples/sample6_unittest.cc
+++ b/ext/googletest/googletest/samples/sample6_unittest.cc
diff --git a/ext/googletest/samples/sample7_unittest.cc b/ext/googletest/googletest/samples/sample7_unittest.cc
index 1b651a21d..1b651a21d 100644
--- a/ext/googletest/samples/sample7_unittest.cc
+++ b/ext/googletest/googletest/samples/sample7_unittest.cc
diff --git a/ext/googletest/samples/sample8_unittest.cc b/ext/googletest/googletest/samples/sample8_unittest.cc
index 727433406..727433406 100644
--- a/ext/googletest/samples/sample8_unittest.cc
+++ b/ext/googletest/googletest/samples/sample8_unittest.cc
diff --git a/ext/googletest/samples/sample9_unittest.cc b/ext/googletest/googletest/samples/sample9_unittest.cc
index b2e2079bf..b2e2079bf 100644
--- a/ext/googletest/samples/sample9_unittest.cc
+++ b/ext/googletest/googletest/samples/sample9_unittest.cc
diff --git a/ext/googletest/scripts/common.py b/ext/googletest/googletest/scripts/common.py
index 3c0347a75..3c0347a75 100644
--- a/ext/googletest/scripts/common.py
+++ b/ext/googletest/googletest/scripts/common.py
diff --git a/ext/googletest/scripts/fuse_gtest_files.py b/ext/googletest/googletest/scripts/fuse_gtest_files.py
index 3f3e9f36d..3f3e9f36d 100755
--- a/ext/googletest/scripts/fuse_gtest_files.py
+++ b/ext/googletest/googletest/scripts/fuse_gtest_files.py
diff --git a/ext/googletest/scripts/gen_gtest_pred_impl.py b/ext/googletest/googletest/scripts/gen_gtest_pred_impl.py
index 3e7ab042e..3e7ab042e 100755
--- a/ext/googletest/scripts/gen_gtest_pred_impl.py
+++ b/ext/googletest/googletest/scripts/gen_gtest_pred_impl.py
diff --git a/ext/googletest/scripts/gtest-config.in b/ext/googletest/googletest/scripts/gtest-config.in
index 780f8432e..780f8432e 100755
--- a/ext/googletest/scripts/gtest-config.in
+++ b/ext/googletest/googletest/scripts/gtest-config.in
diff --git a/ext/googletest/scripts/pump.py b/ext/googletest/googletest/scripts/pump.py
index 5efb653c2..5efb653c2 100755
--- a/ext/googletest/scripts/pump.py
+++ b/ext/googletest/googletest/scripts/pump.py
diff --git a/ext/googletest/scripts/release_docs.py b/ext/googletest/googletest/scripts/release_docs.py
index 1291347f6..1291347f6 100755
--- a/ext/googletest/scripts/release_docs.py
+++ b/ext/googletest/googletest/scripts/release_docs.py
diff --git a/ext/googletest/scripts/test/Makefile b/ext/googletest/googletest/scripts/test/Makefile
index cdff58463..cdff58463 100644
--- a/ext/googletest/scripts/test/Makefile
+++ b/ext/googletest/googletest/scripts/test/Makefile
diff --git a/ext/googletest/scripts/upload.py b/ext/googletest/googletest/scripts/upload.py
index 6e6f9a147..6e6f9a147 100755
--- a/ext/googletest/scripts/upload.py
+++ b/ext/googletest/googletest/scripts/upload.py
diff --git a/ext/googletest/scripts/upload_gtest.py b/ext/googletest/googletest/scripts/upload_gtest.py
index be19ae809..be19ae809 100755
--- a/ext/googletest/scripts/upload_gtest.py
+++ b/ext/googletest/googletest/scripts/upload_gtest.py
diff --git a/ext/googletest/src/gtest-all.cc b/ext/googletest/googletest/src/gtest-all.cc
index 0a9cee522..0a9cee522 100644
--- a/ext/googletest/src/gtest-all.cc
+++ b/ext/googletest/googletest/src/gtest-all.cc
diff --git a/ext/googletest/src/gtest-death-test.cc b/ext/googletest/googletest/src/gtest-death-test.cc
index a01a36983..a01a36983 100644
--- a/ext/googletest/src/gtest-death-test.cc
+++ b/ext/googletest/googletest/src/gtest-death-test.cc
diff --git a/ext/googletest/src/gtest-filepath.cc b/ext/googletest/googletest/src/gtest-filepath.cc
index 0292dc119..0292dc119 100644
--- a/ext/googletest/src/gtest-filepath.cc
+++ b/ext/googletest/googletest/src/gtest-filepath.cc
diff --git a/ext/googletest/src/gtest-internal-inl.h b/ext/googletest/googletest/src/gtest-internal-inl.h
index ed8a682a9..ed8a682a9 100644
--- a/ext/googletest/src/gtest-internal-inl.h
+++ b/ext/googletest/googletest/src/gtest-internal-inl.h
diff --git a/ext/googletest/src/gtest-port.cc b/ext/googletest/googletest/src/gtest-port.cc
index e5bf3dd2b..e5bf3dd2b 100644
--- a/ext/googletest/src/gtest-port.cc
+++ b/ext/googletest/googletest/src/gtest-port.cc
diff --git a/ext/googletest/src/gtest-printers.cc b/ext/googletest/googletest/src/gtest-printers.cc
index a2df412f8..a2df412f8 100644
--- a/ext/googletest/src/gtest-printers.cc
+++ b/ext/googletest/googletest/src/gtest-printers.cc
diff --git a/ext/googletest/src/gtest-test-part.cc b/ext/googletest/googletest/src/gtest-test-part.cc
index fb0e35425..fb0e35425 100644
--- a/ext/googletest/src/gtest-test-part.cc
+++ b/ext/googletest/googletest/src/gtest-test-part.cc
diff --git a/ext/googletest/src/gtest-typed-test.cc b/ext/googletest/googletest/src/gtest-typed-test.cc
index df1eef475..df1eef475 100644
--- a/ext/googletest/src/gtest-typed-test.cc
+++ b/ext/googletest/googletest/src/gtest-typed-test.cc
diff --git a/ext/googletest/src/gtest.cc b/ext/googletest/googletest/src/gtest.cc
index d882ab2e3..d882ab2e3 100644
--- a/ext/googletest/src/gtest.cc
+++ b/ext/googletest/googletest/src/gtest.cc
diff --git a/ext/googletest/src/gtest_main.cc b/ext/googletest/googletest/src/gtest_main.cc
index f30282255..f30282255 100644
--- a/ext/googletest/src/gtest_main.cc
+++ b/ext/googletest/googletest/src/gtest_main.cc
diff --git a/ext/googletest/test/gtest-death-test_ex_test.cc b/ext/googletest/googletest/test/gtest-death-test_ex_test.cc
index b50a13d5e..b50a13d5e 100644
--- a/ext/googletest/test/gtest-death-test_ex_test.cc
+++ b/ext/googletest/googletest/test/gtest-death-test_ex_test.cc
diff --git a/ext/googletest/test/gtest-death-test_test.cc b/ext/googletest/googletest/test/gtest-death-test_test.cc
index bb4a3d1b3..bb4a3d1b3 100644
--- a/ext/googletest/test/gtest-death-test_test.cc
+++ b/ext/googletest/googletest/test/gtest-death-test_test.cc
diff --git a/ext/googletest/test/gtest-filepath_test.cc b/ext/googletest/googletest/test/gtest-filepath_test.cc
index da7298692..da7298692 100644
--- a/ext/googletest/test/gtest-filepath_test.cc
+++ b/ext/googletest/googletest/test/gtest-filepath_test.cc
diff --git a/ext/googletest/test/gtest-linked_ptr_test.cc b/ext/googletest/googletest/test/gtest-linked_ptr_test.cc
index 6fcf5124a..6fcf5124a 100644
--- a/ext/googletest/test/gtest-linked_ptr_test.cc
+++ b/ext/googletest/googletest/test/gtest-linked_ptr_test.cc
diff --git a/ext/googletest/test/gtest-listener_test.cc b/ext/googletest/googletest/test/gtest-listener_test.cc
index 90747685f..90747685f 100644
--- a/ext/googletest/test/gtest-listener_test.cc
+++ b/ext/googletest/googletest/test/gtest-listener_test.cc
diff --git a/ext/googletest/test/gtest-message_test.cc b/ext/googletest/googletest/test/gtest-message_test.cc
index 175238ef4..175238ef4 100644
--- a/ext/googletest/test/gtest-message_test.cc
+++ b/ext/googletest/googletest/test/gtest-message_test.cc
diff --git a/ext/googletest/test/gtest-options_test.cc b/ext/googletest/googletest/test/gtest-options_test.cc
index 5586dc3b1..5586dc3b1 100644
--- a/ext/googletest/test/gtest-options_test.cc
+++ b/ext/googletest/googletest/test/gtest-options_test.cc
diff --git a/ext/googletest/test/gtest-param-test2_test.cc b/ext/googletest/googletest/test/gtest-param-test2_test.cc
index 4a782fe70..4a782fe70 100644
--- a/ext/googletest/test/gtest-param-test2_test.cc
+++ b/ext/googletest/googletest/test/gtest-param-test2_test.cc
diff --git a/ext/googletest/test/gtest-param-test_test.cc b/ext/googletest/googletest/test/gtest-param-test_test.cc
index 8b278bb94..8b278bb94 100644
--- a/ext/googletest/test/gtest-param-test_test.cc
+++ b/ext/googletest/googletest/test/gtest-param-test_test.cc
diff --git a/ext/googletest/test/gtest-param-test_test.h b/ext/googletest/googletest/test/gtest-param-test_test.h
index 26ea122b1..26ea122b1 100644
--- a/ext/googletest/test/gtest-param-test_test.h
+++ b/ext/googletest/googletest/test/gtest-param-test_test.h
diff --git a/ext/googletest/test/gtest-port_test.cc b/ext/googletest/googletest/test/gtest-port_test.cc
index 6ea607bc7..6ea607bc7 100644
--- a/ext/googletest/test/gtest-port_test.cc
+++ b/ext/googletest/googletest/test/gtest-port_test.cc
diff --git a/ext/googletest/test/gtest-printers_test.cc b/ext/googletest/googletest/test/gtest-printers_test.cc
index 3e97cc24a..3e97cc24a 100644
--- a/ext/googletest/test/gtest-printers_test.cc
+++ b/ext/googletest/googletest/test/gtest-printers_test.cc
diff --git a/ext/googletest/test/gtest-test-part_test.cc b/ext/googletest/googletest/test/gtest-test-part_test.cc
index ca8ba933a..ca8ba933a 100644
--- a/ext/googletest/test/gtest-test-part_test.cc
+++ b/ext/googletest/googletest/test/gtest-test-part_test.cc
diff --git a/ext/googletest/test/gtest-tuple_test.cc b/ext/googletest/googletest/test/gtest-tuple_test.cc
index bfaa3e0ac..bfaa3e0ac 100644
--- a/ext/googletest/test/gtest-tuple_test.cc
+++ b/ext/googletest/googletest/test/gtest-tuple_test.cc
diff --git a/ext/googletest/test/gtest-typed-test2_test.cc b/ext/googletest/googletest/test/gtest-typed-test2_test.cc
index c284700b0..c284700b0 100644
--- a/ext/googletest/test/gtest-typed-test2_test.cc
+++ b/ext/googletest/googletest/test/gtest-typed-test2_test.cc
diff --git a/ext/googletest/test/gtest-typed-test_test.cc b/ext/googletest/googletest/test/gtest-typed-test_test.cc
index 93628ba08..93628ba08 100644
--- a/ext/googletest/test/gtest-typed-test_test.cc
+++ b/ext/googletest/googletest/test/gtest-typed-test_test.cc
diff --git a/ext/googletest/test/gtest-typed-test_test.h b/ext/googletest/googletest/test/gtest-typed-test_test.h
index 41d75704c..41d75704c 100644
--- a/ext/googletest/test/gtest-typed-test_test.h
+++ b/ext/googletest/googletest/test/gtest-typed-test_test.h
diff --git a/ext/googletest/test/gtest-unittest-api_test.cc b/ext/googletest/googletest/test/gtest-unittest-api_test.cc
index b1f51688a..b1f51688a 100644
--- a/ext/googletest/test/gtest-unittest-api_test.cc
+++ b/ext/googletest/googletest/test/gtest-unittest-api_test.cc
diff --git a/ext/googletest/test/gtest_all_test.cc b/ext/googletest/googletest/test/gtest_all_test.cc
index 955aa6282..955aa6282 100644
--- a/ext/googletest/test/gtest_all_test.cc
+++ b/ext/googletest/googletest/test/gtest_all_test.cc
diff --git a/ext/googletest/test/gtest_break_on_failure_unittest.py b/ext/googletest/googletest/test/gtest_break_on_failure_unittest.py
index 78f3e0f53..78f3e0f53 100755
--- a/ext/googletest/test/gtest_break_on_failure_unittest.py
+++ b/ext/googletest/googletest/test/gtest_break_on_failure_unittest.py
diff --git a/ext/googletest/test/gtest_break_on_failure_unittest_.cc b/ext/googletest/googletest/test/gtest_break_on_failure_unittest_.cc
index dd07478c0..dd07478c0 100644
--- a/ext/googletest/test/gtest_break_on_failure_unittest_.cc
+++ b/ext/googletest/googletest/test/gtest_break_on_failure_unittest_.cc
diff --git a/ext/googletest/test/gtest_catch_exceptions_test.py b/ext/googletest/googletest/test/gtest_catch_exceptions_test.py
index e6fc22fd1..e6fc22fd1 100755
--- a/ext/googletest/test/gtest_catch_exceptions_test.py
+++ b/ext/googletest/googletest/test/gtest_catch_exceptions_test.py
diff --git a/ext/googletest/test/gtest_catch_exceptions_test_.cc b/ext/googletest/googletest/test/gtest_catch_exceptions_test_.cc
index d0fc82c99..d0fc82c99 100644
--- a/ext/googletest/test/gtest_catch_exceptions_test_.cc
+++ b/ext/googletest/googletest/test/gtest_catch_exceptions_test_.cc
diff --git a/ext/googletest/test/gtest_color_test.py b/ext/googletest/googletest/test/gtest_color_test.py
index d02a53ed8..d02a53ed8 100755
--- a/ext/googletest/test/gtest_color_test.py
+++ b/ext/googletest/googletest/test/gtest_color_test.py
diff --git a/ext/googletest/test/gtest_color_test_.cc b/ext/googletest/googletest/test/gtest_color_test_.cc
index f61ebb89b..f61ebb89b 100644
--- a/ext/googletest/test/gtest_color_test_.cc
+++ b/ext/googletest/googletest/test/gtest_color_test_.cc
diff --git a/ext/googletest/test/gtest_env_var_test.py b/ext/googletest/googletest/test/gtest_env_var_test.py
index 424075cfa..424075cfa 100755
--- a/ext/googletest/test/gtest_env_var_test.py
+++ b/ext/googletest/googletest/test/gtest_env_var_test.py
diff --git a/ext/googletest/test/gtest_env_var_test_.cc b/ext/googletest/googletest/test/gtest_env_var_test_.cc
index 539afc968..539afc968 100644
--- a/ext/googletest/test/gtest_env_var_test_.cc
+++ b/ext/googletest/googletest/test/gtest_env_var_test_.cc
diff --git a/ext/googletest/test/gtest_environment_test.cc b/ext/googletest/googletest/test/gtest_environment_test.cc
index 3cff19e70..3cff19e70 100644
--- a/ext/googletest/test/gtest_environment_test.cc
+++ b/ext/googletest/googletest/test/gtest_environment_test.cc
diff --git a/ext/googletest/test/gtest_filter_unittest.py b/ext/googletest/googletest/test/gtest_filter_unittest.py
index ec0b151b1..ec0b151b1 100755
--- a/ext/googletest/test/gtest_filter_unittest.py
+++ b/ext/googletest/googletest/test/gtest_filter_unittest.py
diff --git a/ext/googletest/test/gtest_filter_unittest_.cc b/ext/googletest/googletest/test/gtest_filter_unittest_.cc
index 77deffc38..77deffc38 100644
--- a/ext/googletest/test/gtest_filter_unittest_.cc
+++ b/ext/googletest/googletest/test/gtest_filter_unittest_.cc
diff --git a/ext/googletest/test/gtest_help_test.py b/ext/googletest/googletest/test/gtest_help_test.py
index 093c838d9..093c838d9 100755
--- a/ext/googletest/test/gtest_help_test.py
+++ b/ext/googletest/googletest/test/gtest_help_test.py
diff --git a/ext/googletest/test/gtest_help_test_.cc b/ext/googletest/googletest/test/gtest_help_test_.cc
index 31f78c244..31f78c244 100644
--- a/ext/googletest/test/gtest_help_test_.cc
+++ b/ext/googletest/googletest/test/gtest_help_test_.cc
diff --git a/ext/googletest/test/gtest_list_tests_unittest.py b/ext/googletest/googletest/test/gtest_list_tests_unittest.py
index f2d2fd1b1..f2d2fd1b1 100755
--- a/ext/googletest/test/gtest_list_tests_unittest.py
+++ b/ext/googletest/googletest/test/gtest_list_tests_unittest.py
diff --git a/ext/googletest/test/gtest_list_tests_unittest_.cc b/ext/googletest/googletest/test/gtest_list_tests_unittest_.cc
index 907c176ba..907c176ba 100644
--- a/ext/googletest/test/gtest_list_tests_unittest_.cc
+++ b/ext/googletest/googletest/test/gtest_list_tests_unittest_.cc
diff --git a/ext/googletest/test/gtest_main_unittest.cc b/ext/googletest/googletest/test/gtest_main_unittest.cc
index ecd9bb876..ecd9bb876 100644
--- a/ext/googletest/test/gtest_main_unittest.cc
+++ b/ext/googletest/googletest/test/gtest_main_unittest.cc
diff --git a/ext/googletest/test/gtest_no_test_unittest.cc b/ext/googletest/googletest/test/gtest_no_test_unittest.cc
index 292599af8..292599af8 100644
--- a/ext/googletest/test/gtest_no_test_unittest.cc
+++ b/ext/googletest/googletest/test/gtest_no_test_unittest.cc
diff --git a/ext/googletest/test/gtest_output_test.py b/ext/googletest/googletest/test/gtest_output_test.py
index 06dbee098..06dbee098 100755
--- a/ext/googletest/test/gtest_output_test.py
+++ b/ext/googletest/googletest/test/gtest_output_test.py
diff --git a/ext/googletest/test/gtest_output_test_.cc b/ext/googletest/googletest/test/gtest_output_test_.cc
index 1070a9f26..1070a9f26 100644
--- a/ext/googletest/test/gtest_output_test_.cc
+++ b/ext/googletest/googletest/test/gtest_output_test_.cc
diff --git a/ext/googletest/test/gtest_output_test_golden_lin.txt b/ext/googletest/googletest/test/gtest_output_test_golden_lin.txt
index 2223d560e..2223d560e 100644
--- a/ext/googletest/test/gtest_output_test_golden_lin.txt
+++ b/ext/googletest/googletest/test/gtest_output_test_golden_lin.txt
diff --git a/ext/googletest/test/gtest_pred_impl_unittest.cc b/ext/googletest/googletest/test/gtest_pred_impl_unittest.cc
index a84eff860..a84eff860 100644
--- a/ext/googletest/test/gtest_pred_impl_unittest.cc
+++ b/ext/googletest/googletest/test/gtest_pred_impl_unittest.cc
diff --git a/ext/googletest/test/gtest_premature_exit_test.cc b/ext/googletest/googletest/test/gtest_premature_exit_test.cc
index 3b4dc7d43..3b4dc7d43 100644
--- a/ext/googletest/test/gtest_premature_exit_test.cc
+++ b/ext/googletest/googletest/test/gtest_premature_exit_test.cc
diff --git a/ext/googletest/test/gtest_prod_test.cc b/ext/googletest/googletest/test/gtest_prod_test.cc
index 060abce18..060abce18 100644
--- a/ext/googletest/test/gtest_prod_test.cc
+++ b/ext/googletest/googletest/test/gtest_prod_test.cc
diff --git a/ext/googletest/test/gtest_repeat_test.cc b/ext/googletest/googletest/test/gtest_repeat_test.cc
index 481012adc..481012adc 100644
--- a/ext/googletest/test/gtest_repeat_test.cc
+++ b/ext/googletest/googletest/test/gtest_repeat_test.cc
diff --git a/ext/googletest/test/gtest_shuffle_test.py b/ext/googletest/googletest/test/gtest_shuffle_test.py
index 30d0303d1..30d0303d1 100755
--- a/ext/googletest/test/gtest_shuffle_test.py
+++ b/ext/googletest/googletest/test/gtest_shuffle_test.py
diff --git a/ext/googletest/test/gtest_shuffle_test_.cc b/ext/googletest/googletest/test/gtest_shuffle_test_.cc
index 6fb441bd4..6fb441bd4 100644
--- a/ext/googletest/test/gtest_shuffle_test_.cc
+++ b/ext/googletest/googletest/test/gtest_shuffle_test_.cc
diff --git a/ext/googletest/test/gtest_sole_header_test.cc b/ext/googletest/googletest/test/gtest_sole_header_test.cc
index ccd091a28..ccd091a28 100644
--- a/ext/googletest/test/gtest_sole_header_test.cc
+++ b/ext/googletest/googletest/test/gtest_sole_header_test.cc
diff --git a/ext/googletest/test/gtest_stress_test.cc b/ext/googletest/googletest/test/gtest_stress_test.cc
index e7daa430d..e7daa430d 100644
--- a/ext/googletest/test/gtest_stress_test.cc
+++ b/ext/googletest/googletest/test/gtest_stress_test.cc
diff --git a/ext/googletest/test/gtest_test_utils.py b/ext/googletest/googletest/test/gtest_test_utils.py
index 4acd36c97..4acd36c97 100755
--- a/ext/googletest/test/gtest_test_utils.py
+++ b/ext/googletest/googletest/test/gtest_test_utils.py
diff --git a/ext/googletest/test/gtest_throw_on_failure_ex_test.cc b/ext/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc
index 8d46c76f1..8d46c76f1 100644
--- a/ext/googletest/test/gtest_throw_on_failure_ex_test.cc
+++ b/ext/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc
diff --git a/ext/googletest/test/gtest_throw_on_failure_test.py b/ext/googletest/googletest/test/gtest_throw_on_failure_test.py
index 3e7740cab..3e7740cab 100755
--- a/ext/googletest/test/gtest_throw_on_failure_test.py
+++ b/ext/googletest/googletest/test/gtest_throw_on_failure_test.py
diff --git a/ext/googletest/test/gtest_throw_on_failure_test_.cc b/ext/googletest/googletest/test/gtest_throw_on_failure_test_.cc
index 2b88fe3d9..2b88fe3d9 100644
--- a/ext/googletest/test/gtest_throw_on_failure_test_.cc
+++ b/ext/googletest/googletest/test/gtest_throw_on_failure_test_.cc
diff --git a/ext/googletest/test/gtest_uninitialized_test.py b/ext/googletest/googletest/test/gtest_uninitialized_test.py
index 435837009..435837009 100755
--- a/ext/googletest/test/gtest_uninitialized_test.py
+++ b/ext/googletest/googletest/test/gtest_uninitialized_test.py
diff --git a/ext/googletest/test/gtest_uninitialized_test_.cc b/ext/googletest/googletest/test/gtest_uninitialized_test_.cc
index 44316987f..44316987f 100644
--- a/ext/googletest/test/gtest_uninitialized_test_.cc
+++ b/ext/googletest/googletest/test/gtest_uninitialized_test_.cc
diff --git a/ext/googletest/test/gtest_unittest.cc b/ext/googletest/googletest/test/gtest_unittest.cc
index 88e94134b..88e94134b 100644
--- a/ext/googletest/test/gtest_unittest.cc
+++ b/ext/googletest/googletest/test/gtest_unittest.cc
diff --git a/ext/googletest/test/gtest_xml_outfile1_test_.cc b/ext/googletest/googletest/test/gtest_xml_outfile1_test_.cc
index 531ced49d..531ced49d 100644
--- a/ext/googletest/test/gtest_xml_outfile1_test_.cc
+++ b/ext/googletest/googletest/test/gtest_xml_outfile1_test_.cc
diff --git a/ext/googletest/test/gtest_xml_outfile2_test_.cc b/ext/googletest/googletest/test/gtest_xml_outfile2_test_.cc
index 7b400b276..7b400b276 100644
--- a/ext/googletest/test/gtest_xml_outfile2_test_.cc
+++ b/ext/googletest/googletest/test/gtest_xml_outfile2_test_.cc
diff --git a/ext/googletest/test/gtest_xml_outfiles_test.py b/ext/googletest/googletest/test/gtest_xml_outfiles_test.py
index 524e437e6..524e437e6 100755
--- a/ext/googletest/test/gtest_xml_outfiles_test.py
+++ b/ext/googletest/googletest/test/gtest_xml_outfiles_test.py
diff --git a/ext/googletest/test/gtest_xml_output_unittest.py b/ext/googletest/googletest/test/gtest_xml_output_unittest.py
index bcd597599..bcd597599 100755
--- a/ext/googletest/test/gtest_xml_output_unittest.py
+++ b/ext/googletest/googletest/test/gtest_xml_output_unittest.py
diff --git a/ext/googletest/test/gtest_xml_output_unittest_.cc b/ext/googletest/googletest/test/gtest_xml_output_unittest_.cc
index 48b8771b5..48b8771b5 100644
--- a/ext/googletest/test/gtest_xml_output_unittest_.cc
+++ b/ext/googletest/googletest/test/gtest_xml_output_unittest_.cc
diff --git a/ext/googletest/test/gtest_xml_test_utils.py b/ext/googletest/googletest/test/gtest_xml_test_utils.py
index 341956b54..341956b54 100755
--- a/ext/googletest/test/gtest_xml_test_utils.py
+++ b/ext/googletest/googletest/test/gtest_xml_test_utils.py
diff --git a/ext/googletest/test/production.cc b/ext/googletest/googletest/test/production.cc
index 8b8a40b44..8b8a40b44 100644
--- a/ext/googletest/test/production.cc
+++ b/ext/googletest/googletest/test/production.cc
diff --git a/ext/googletest/test/production.h b/ext/googletest/googletest/test/production.h
index 98fd5e476..98fd5e476 100644
--- a/ext/googletest/test/production.h
+++ b/ext/googletest/googletest/test/production.h
diff --git a/ext/googletest/xcode/Config/DebugProject.xcconfig b/ext/googletest/googletest/xcode/Config/DebugProject.xcconfig
index 3d68157d5..3d68157d5 100644
--- a/ext/googletest/xcode/Config/DebugProject.xcconfig
+++ b/ext/googletest/googletest/xcode/Config/DebugProject.xcconfig
diff --git a/ext/googletest/xcode/Config/FrameworkTarget.xcconfig b/ext/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig
index 357b1c8fb..357b1c8fb 100644
--- a/ext/googletest/xcode/Config/FrameworkTarget.xcconfig
+++ b/ext/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig
diff --git a/ext/googletest/xcode/Config/General.xcconfig b/ext/googletest/googletest/xcode/Config/General.xcconfig
index f23e32227..f23e32227 100644
--- a/ext/googletest/xcode/Config/General.xcconfig
+++ b/ext/googletest/googletest/xcode/Config/General.xcconfig
diff --git a/ext/googletest/xcode/Config/ReleaseProject.xcconfig b/ext/googletest/googletest/xcode/Config/ReleaseProject.xcconfig
index 5349f0a04..5349f0a04 100644
--- a/ext/googletest/xcode/Config/ReleaseProject.xcconfig
+++ b/ext/googletest/googletest/xcode/Config/ReleaseProject.xcconfig
diff --git a/ext/googletest/xcode/Config/StaticLibraryTarget.xcconfig b/ext/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig
index 3922fa51d..3922fa51d 100644
--- a/ext/googletest/xcode/Config/StaticLibraryTarget.xcconfig
+++ b/ext/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig
diff --git a/ext/googletest/xcode/Config/TestTarget.xcconfig b/ext/googletest/googletest/xcode/Config/TestTarget.xcconfig
index e6652ba85..e6652ba85 100644
--- a/ext/googletest/xcode/Config/TestTarget.xcconfig
+++ b/ext/googletest/googletest/xcode/Config/TestTarget.xcconfig
diff --git a/ext/googletest/xcode/Resources/Info.plist b/ext/googletest/googletest/xcode/Resources/Info.plist
index 9dd28ea14..9dd28ea14 100644
--- a/ext/googletest/xcode/Resources/Info.plist
+++ b/ext/googletest/googletest/xcode/Resources/Info.plist
diff --git a/ext/googletest/xcode/Samples/FrameworkSample/Info.plist b/ext/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist
index f3852edea..f3852edea 100644
--- a/ext/googletest/xcode/Samples/FrameworkSample/Info.plist
+++ b/ext/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist
diff --git a/ext/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/ext/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
index 497617eb6..497617eb6 100644
--- a/ext/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
+++ b/ext/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
diff --git a/ext/googletest/xcode/Samples/FrameworkSample/runtests.sh b/ext/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh
index 4a0d413e5..4a0d413e5 100644
--- a/ext/googletest/xcode/Samples/FrameworkSample/runtests.sh
+++ b/ext/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh
diff --git a/ext/googletest/xcode/Samples/FrameworkSample/widget.cc b/ext/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc
index bfc4e7fcf..bfc4e7fcf 100644
--- a/ext/googletest/xcode/Samples/FrameworkSample/widget.cc
+++ b/ext/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc
diff --git a/ext/googletest/xcode/Samples/FrameworkSample/widget.h b/ext/googletest/googletest/xcode/Samples/FrameworkSample/widget.h
index 0c55cdc8c..0c55cdc8c 100644
--- a/ext/googletest/xcode/Samples/FrameworkSample/widget.h
+++ b/ext/googletest/googletest/xcode/Samples/FrameworkSample/widget.h
diff --git a/ext/googletest/xcode/Samples/FrameworkSample/widget_test.cc b/ext/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc
index 872599421..872599421 100644
--- a/ext/googletest/xcode/Samples/FrameworkSample/widget_test.cc
+++ b/ext/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc
diff --git a/ext/googletest/xcode/Scripts/runtests.sh b/ext/googletest/googletest/xcode/Scripts/runtests.sh
index 3fc229f1d..3fc229f1d 100644
--- a/ext/googletest/xcode/Scripts/runtests.sh
+++ b/ext/googletest/googletest/xcode/Scripts/runtests.sh
diff --git a/ext/googletest/xcode/Scripts/versiongenerate.py b/ext/googletest/googletest/xcode/Scripts/versiongenerate.py
index 81de8c96a..81de8c96a 100755
--- a/ext/googletest/xcode/Scripts/versiongenerate.py
+++ b/ext/googletest/googletest/xcode/Scripts/versiongenerate.py
diff --git a/ext/googletest/xcode/gtest.xcodeproj/project.pbxproj b/ext/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj
index aefaa88b0..aefaa88b0 100644
--- a/ext/googletest/xcode/gtest.xcodeproj/project.pbxproj
+++ b/ext/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj