Merge branch 'master' into develop

# Conflicts:
#	xpcPlugin/XPlaneConnect/mac.xpl
#	xpcPlugin/xpcPlugin.xcodeproj/project.pbxproj

TestScripts/MATLAB Tests/getCTRLTest.m

@@ -0,0 +1,15 @@
+function getCTRLTest()
+%GETCTRLTEST Summary of this function goes here
+%   Detailed explanation goes here
+addpath('../../MATLAB')
+import XPlaneConnect.*
+
+values = [10.0, 5.0, -5.0, 0.8, 1.0, 0.5, -1.5];
+sendCTRL(values, 0);
+actual = getCTRL(0);
+
+assert(isequal(length(actual), length(values)));
+for i = 1:length(actual)
+    assert(abs(actual(i) - values(i)) <1e-4)
+end
+end