merged 1.3 r1048:1049 into 1.4 and trunk

src/test/integtests/platform/COSXKeyStateTests.cpp

@@ -26,6 +26,8 @@ CGKeyCode escKeyCode = 53;
 CGKeyCode shiftKeyCode = 56;
 CGKeyCode controlKeyCode = 59;
 
+// TODO: make pollActiveModifiers tests work reliably. 
+/*
 TEST(COSXKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect)
 {
 	CMockKeyMap keyMap;
@@ -93,3 +95,4 @@ TEST(COSXKeyStateTests, pollActiveModifiers_controlKeyDownThenUp_masksAreCorrect
 	EXPECT_TRUE((upMask & KeyModifierControl) == 0)
 		<< "control key still in mask (" << upMask << ") - make sure no keys are being held down";
 }
+*/