Drops back to c373429a6e16d4dda687a9090117fce5f3a8bc7e

on Feb 20 when I forked locally.
Merge branch 'master' of github.com:andybarry/ardupilot

Conflicts:
	libraries/AP_Airspeed/AP_Airspeed.cpp