Merge branch 'master' into mpc_local_pos

ROMFS/px4fmu_common/init.d/11001_hexa_cox

ROMFS/px4fmu_common/init.d/12001_octo_cox

ROMFS/px4fmu_common/init.d/3031_phantom

ROMFS/px4fmu_common/init.d/3032_skywalker_x5

ROMFS/px4fmu_common/init.d/rcS

ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix

mavlink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h

...ink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_ahrs.h

...nk/include/mavlink/v1.0/ardupilotmega/mavlink_msg_ahrs2.h

...mavlink/v1.0/ardupilotmega/mavlink_msg_airspeed_autocal.h

...k/include/mavlink/v1.0/ardupilotmega/mavlink_msg_ap_adc.h

...avlink/v1.0/ardupilotmega/mavlink_msg_compassmot_status.h

...k/include/mavlink/v1.0/ardupilotmega/mavlink_msg_data16.h

...k/include/mavlink/v1.0/ardupilotmega/mavlink_msg_data32.h

...k/include/mavlink/v1.0/ardupilotmega/mavlink_msg_data64.h

...k/include/mavlink/v1.0/ardupilotmega/mavlink_msg_data96.h

...avlink/v1.0/ardupilotmega/mavlink_msg_digicam_configure.h

.../mavlink/v1.0/ardupilotmega/mavlink_msg_digicam_control.h

...avlink/v1.0/ardupilotmega/mavlink_msg_fence_fetch_point.h

...lude/mavlink/v1.0/ardupilotmega/mavlink_msg_fence_point.h