Merge branch 'master' of github.com:PX4/Firmware into fixedwing
Removed commented-out lines (EXP support)
Merge branch 'fixedwing' of git://github.com/PX4/Firmware into sensor_hil_fixedwing