...
Merge remote-tracking branch 'origin/master'

Conflicts:
	subProjects/MAVLINK_TEST/MAVLINK_TEST.spin