merge conflict
merge conflict

Icenowy/apm_planner,jy723/qgroundcontrol,LIKAIMO/apm_planner,abcdelf/apm_planner,gpaes/apm_planner,RedoXyde/PX4_qGCS,labtoast/apm_planner,lis-epfl/qgroundcontrol,UAVenture/qgroundcontrol,ethz-asl/qgc_asl,mihadyuk/qgroundcontrol,caoxiongkun/qgroundcontrol,cfelipesouza/qgroundcontrol,mihadyuk/qgroundcontrol,LIKAIMO/qgroundcontrol,UAVenture/qgroundcontrol,fizzaly/qgroundcontrol,sutherlandm/apm_planner,hejunbok/apm_planner,devbharat/qgroundcontrol,sverling/qgc_asl,scott-eddy/qgroundcontrol,scott-eddy/qgroundcontrol,chen0510566/apm_planner,TheIronBorn/qgroundcontrol,caoxiongkun/qgroundcontrol,kd0aij/qgroundcontrol,sutherlandm/apm_planner,devbharat/qgroundcontrol,cfelipesouza/qgroundcontrol,LittleBun/apm_planner,WorkerBees/apm_planner,ethz-asl/qgc_asl,caoxiongkun/qgroundcontrol,cfelipesouza/qgroundcontrol,LIKAIMO/qgroundcontrol,remspoor/qgroundcontrol,caoxiongkun/qgroundcontrol,LIKAIMO/qgroundcontrol,jy723/qgroundcontrol,fizzaly/qgroundcontrol,LittleBun/apm_planner,cfelipesouza/qgroundcontrol,xros/apm_planner,mirkix/apm_planner,diydrones/apm_planner,BMP-TECH/qgroundcontrol,mirkix/apm_planner,iidioter/qgroundcontrol,xros/apm_planner,hejunbok/apm_planner,gpaes/apm_planner,TheIronBorn/qgroundcontrol,dagoodma/qgroundcontrol,greenoaktree/qgroundcontrol,catch-twenty-two/qgroundcontrol,chen0510566/apm_planner,abcdelf/apm_planner,dcarpy/apm_planner,sutherlandm/apm_planner,ethz-asl/qgc_asl,RedoXyde/PX4_qGCS,catch-twenty-two/qgroundcontrol,Hunter522/qgroundcontrol,greenoaktree/qgroundcontrol,hejunbok/qgroundcontrol,UAVenture/qgroundcontrol,dcarpy/apm_planner,CornerOfSkyline/qgroundcontrol,kellyschrock/apm_planner,Hunter522/qgroundcontrol,381426068/apm_planner,CornerOfSkyline/qgroundcontrol,remspoor/qgroundcontrol,scott-eddy/qgroundcontrol,iidioter/qgroundcontrol,iidioter/qgroundcontrol,kd0aij/qgroundcontrol,kellyschrock/apm_planner,Hunter522/qgroundcontrol,iidioter/qgroundcontrol,dagoodma/qgroundcontrol,LittleBun/apm_planner,mirkix/apm_planner,hejunbok/qgroundcontrol,abcdelf/apm_planner,hejunbok/qgroundcontrol,sverling/qgc_asl,jy723/qgroundcontrol,mirkix/apm_planner,nado1688/qgroundcontrol,mrpilot2/apm_planner,UAVenture/qgroundcontrol,BMP-TECH/qgroundcontrol,hejunbok/qgroundcontrol,remspoor/qgroundcontrol,LittleBun/apm_planner,mrpilot2/apm_planner,hejunbok/qgroundcontrol,CornerOfSkyline/qgroundcontrol,mirkix/apm_planner,chen0510566/apm_planner,kd0aij/qgroundcontrol,remspoor/qgroundcontrol,Icenowy/apm_planner,dcarpy/apm_planner,greenoaktree/qgroundcontrol,greenoaktree/qgroundcontrol,dagoodma/qgroundcontrol,hejunbok/apm_planner,mihadyuk/qgroundcontrol,TheIronBorn/qgroundcontrol,dcarpy/apm_planner,remspoor/qgroundcontrol,chen0510566/apm_planner,catch-twenty-two/qgroundcontrol,dagoodma/qgroundcontrol,diydrones/apm_planner,diydrones/apm_planner,devbharat/qgroundcontrol,nado1688/qgroundcontrol,duststorm/apm_planner,labtoast/apm_planner,nado1688/qgroundcontrol,kellyschrock/apm_planner,mrpilot2/apm_planner,josephlewis42/UDenverQGC2,mirkix/apm_planner,dagoodma/qgroundcontrol,gpaes/apm_planner,CornerOfSkyline/qgroundcontrol,sverling/qgc_asl,scott-eddy/qgroundcontrol,LIKAIMO/apm_planner,lis-epfl/qgroundcontrol,LIKAIMO/qgroundcontrol,jy723/qgroundcontrol,381426068/apm_planner,catch-twenty-two/qgroundcontrol,caoxiongkun/qgroundcontrol,xros/apm_planner,nado1688/qgroundcontrol,nado1688/qgroundcontrol,catch-twenty-two/qgroundcontrol,RedoXyde/PX4_qGCS,hejunbok/apm_planner,UAVenture/qgroundcontrol,scott-eddy/qgroundcontrol,greenoaktree/qgroundcontrol,Hunter522/qgroundcontrol,josephlewis42/UDenverQGC2,gpaes/apm_planner,josephlewis42/UDenverQGC2,mrpilot2/apm_planner,381426068/apm_planner,abcdelf/apm_planner,fizzaly/qgroundcontrol,LIKAIMO/apm_planner,abcdelf/apm_planner,sutherlandm/apm_planner,sverling/qgc_asl,chen0510566/apm_planner,kellyschrock/apm_planner,sverling/qgc_asl,diydrones/apm_planner,labtoast/apm_planner,kd0aij/qgroundcontrol,kellyschrock/apm_planner,iidioter/qgroundcontrol,kellyschrock/apm_planner,Hunter522/qgroundcontrol,381426068/apm_planner,BMP-TECH/qgroundcontrol,abcdelf/apm_planner,WorkerBees/apm_planner,fizzaly/qgroundcontrol,ethz-asl/qgc_asl,LIKAIMO/apm_planner,chen0510566/apm_planner,mihadyuk/qgroundcontrol,kd0aij/qgroundcontrol,381426068/apm_planner,dagoodma/qgroundcontrol,Hunter522/qgroundcontrol,RedoXyde/PX4_qGCS,BMP-TECH/qgroundcontrol,lis-epfl/qgroundcontrol,devbharat/qgroundcontrol,nado1688/qgroundcontrol,mihadyuk/qgroundcontrol,iidioter/qgroundcontrol,diydrones/apm_planner,jy723/qgroundcontrol,LIKAIMO/apm_planner,devbharat/qgroundcontrol,remspoor/qgroundcontrol,sutherlandm/apm_planner,BMP-TECH/qgroundcontrol,catch-twenty-two/qgroundcontrol,labtoast/apm_planner,mihadyuk/qgroundcontrol,LIKAIMO/apm_planner,cfelipesouza/qgroundcontrol,hejunbok/apm_planner,labtoast/apm_planner,LIKAIMO/qgroundcontrol,LittleBun/apm_planner,ethz-asl/qgc_asl,LIKAIMO/qgroundcontrol,BMP-TECH/qgroundcontrol,gpaes/apm_planner,mrpilot2/apm_planner,WorkerBees/apm_planner,duststorm/apm_planner,dcarpy/apm_planner,lis-epfl/qgroundcontrol,Icenowy/apm_planner,Icenowy/apm_planner,RedoXyde/PX4_qGCS,hejunbok/apm_planner,kd0aij/qgroundcontrol,LittleBun/apm_planner,devbharat/qgroundcontrol,CornerOfSkyline/qgroundcontrol,Icenowy/apm_planner,dcarpy/apm_planner,diydrones/apm_planner,duststorm/apm_planner,greenoaktree/qgroundcontrol,jy723/qgroundcontrol,duststorm/apm_planner,hejunbok/qgroundcontrol,duststorm/apm_planner,TheIronBorn/qgroundcontrol,sutherlandm/apm_planner,gpaes/apm_planner,TheIronBorn/qgroundcontrol,labtoast/apm_planner,RedoXyde/PX4_qGCS,fizzaly/qgroundcontrol,scott-eddy/qgroundcontrol,TheIronBorn/qgroundcontrol,xros/apm_planner,fizzaly/qgroundcontrol,lis-epfl/qgroundcontrol,cfelipesouza/qgroundcontrol,caoxiongkun/qgroundcontrol,xros/apm_planner,WorkerBees/apm_planner,duststorm/apm_planner,josephlewis42/UDenverQGC2,Icenowy/apm_planner,381426068/apm_planner,UAVenture/qgroundcontrol,CornerOfSkyline/qgroundcontrol,xros/apm_planner,mrpilot2/apm_planner