Merge proposals dependent on lp:~qgroundcontrol-builders/qgroundcontrol/master

lp:~qgroundcontrol-builders/qgroundcontrol/master has no merge proposals.