Merge branch 'master' into patch-1

gennadiycivil · web-flow · commit 09beafcd1d54 · 2018-11-13T10:52:25.000-05:00
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
@@ -47,6 +47,7 @@
 #include <ostream>  // NOLINT
 #include <sstream>
 #include <string>
+#include <type_traits>
 #include <utility>
 #include <vector>
 #include "gmock/internal/gmock-internal-utils.h"
