Merge branch 'master' into compatibility

src/Math/Test/Vector3Test.cpp

@@ -94,6 +94,7 @@ Vector3Test::Vector3Test() {
               &Vector3Test::scales,
               &Vector3Test::twoComponent,
 
+              &Vector3Test::swizzleType,
               &Vector3Test::debug,
               &Vector3Test::configuration});
 }

src/Platform/NaClApplication.h

@@ -443,7 +443,7 @@ class NaClApplication::InputEvent {
         constexpr Modifiers modifiers() const { return _modifiers; }
 
         /** @brief Mouse buttons */
-        constexpr Buttons buttons() const { return Buttons(_modifiers); }
+        constexpr Buttons buttons() const { return Button(static_cast<std::uint32_t>(_modifiers)); }
 
         /**
          * @brief Set event as accepted