multirotor_pos_control: setpint reset rewritten
Merge branch 'master' into takeoff_sp_fix
Implement message based receiver pairing
Refactor dsm binding code in px4io.cpp

- Move repeated code into member function
DSM pairing cleanup in px4io.cpp

- Simplify parameter range checking in dsm_bind_ioctl
- Replace DSM magic numbers with symbolic constants
Merge pull request #395 from jean-m-cyr/master

Implement message based receiver pairing
Merge pull request #393 from PX4/takeoff_sp_fix

multirotor_pos_control: setpoint reset rewritten
Beep and print message when arming is not allowed
Merge pull request #399 from PX4/arm_alarm

Beep and print message when arming is not allowed
Merge branch 'master' of github.com:PX4/Firmware into app_end_hang
Make mixer upload not depending on single serial transfer error
A bit more NuttX gdb/python tooling to recover an interrupted context. Needs more fleshing out.
Merge branch 'master' of github.com:PX4/Firmware into app_end_hang
Add hang example also for v2