Merge remote-tracking branch 'upstream/master' into contrib

include/internal/catch_common.cpp

@@ -34,9 +34,6 @@ namespace Catch {
         return os;
     }
 
-    bool alwaysTrue() { return true; }
-    bool alwaysFalse() { return false; }
-
     std::string StreamEndStop::operator+() const {
         return std::string();
     }