Merge proposals

qgroundcontrol has no merge proposals.