Merge branch 'master' into mavlinkrates3
Improved comment of bridge header
Merge pull request #1222 from PX4/asfilter

Airspeed filtering, reinstate TECS for testing
Add missing lock
airspeed: Filter slightly more, just a touch to not induce phase delay
Code style fixes
Merge pull request #1217 from PX4/mavlinkrates2

Mavlink: don't use mavlink helpers
Merge pull request #1236 from PX4/real_life_timeouts

Increase GPS position timeout to real-life timeouts. More work needed.
Merged master
Comment fix
Default to TECS
Merge branch 'stable'
sdlog2_dump.py: minor fix allowing handling FMT messages in the middle of stream
Merge pull request #1246 from PX4/sdlog2_dump_apm

sdlog2_dump.py: minor fix
TECS: Added separate gain / time constant for the throttle loop to allow independent tuning
mavlink, rc.usb: increase HIL_CONTROLS rate and datarate on USB to allow HIL simulation @ 200Hz
Merge pull request #1248 from PX4/hil_200hz

HIL simulation at 200Hz
UAVCAN update
UAVCAN node version info
Removed misleading comment from the UAVCAN module makefile