Update from PX4 Master Dec. 21