Fix merge screwup
Fix merge screwup

mihadyuk/qgroundcontrol,nado1688/qgroundcontrol,UAVenture/qgroundcontrol,ethz-asl/qgc_asl,catch-twenty-two/qgroundcontrol,cfelipesouza/qgroundcontrol,fizzaly/qgroundcontrol,mihadyuk/qgroundcontrol,iidioter/qgroundcontrol,TheIronBorn/qgroundcontrol,remspoor/qgroundcontrol,Hunter522/qgroundcontrol,RedoXyde/PX4_qGCS,iidioter/qgroundcontrol,Hunter522/qgroundcontrol,remspoor/qgroundcontrol,CornerOfSkyline/qgroundcontrol,jy723/qgroundcontrol,LIKAIMO/qgroundcontrol,iidioter/qgroundcontrol,CornerOfSkyline/qgroundcontrol,kd0aij/qgroundcontrol,UAVenture/qgroundcontrol,TheIronBorn/qgroundcontrol,BMP-TECH/qgroundcontrol,RedoXyde/PX4_qGCS,TheIronBorn/qgroundcontrol,BMP-TECH/qgroundcontrol,remspoor/qgroundcontrol,UAVenture/qgroundcontrol,caoxiongkun/qgroundcontrol,devbharat/qgroundcontrol,cfelipesouza/qgroundcontrol,greenoaktree/qgroundcontrol,cfelipesouza/qgroundcontrol,scott-eddy/qgroundcontrol,dagoodma/qgroundcontrol,greenoaktree/qgroundcontrol,RedoXyde/PX4_qGCS,greenoaktree/qgroundcontrol,Hunter522/qgroundcontrol,UAVenture/qgroundcontrol,UAVenture/qgroundcontrol,kd0aij/qgroundcontrol,lis-epfl/qgroundcontrol,fizzaly/qgroundcontrol,BMP-TECH/qgroundcontrol,devbharat/qgroundcontrol,hejunbok/qgroundcontrol,jy723/qgroundcontrol,kd0aij/qgroundcontrol,TheIronBorn/qgroundcontrol,BMP-TECH/qgroundcontrol,lis-epfl/qgroundcontrol,devbharat/qgroundcontrol,RedoXyde/PX4_qGCS,mihadyuk/qgroundcontrol,lis-epfl/qgroundcontrol,hejunbok/qgroundcontrol,remspoor/qgroundcontrol,RedoXyde/PX4_qGCS,mihadyuk/qgroundcontrol,caoxiongkun/qgroundcontrol,LIKAIMO/qgroundcontrol,catch-twenty-two/qgroundcontrol,dagoodma/qgroundcontrol,scott-eddy/qgroundcontrol,scott-eddy/qgroundcontrol,LIKAIMO/qgroundcontrol,devbharat/qgroundcontrol,iidioter/qgroundcontrol,iidioter/qgroundcontrol,CornerOfSkyline/qgroundcontrol,lis-epfl/qgroundcontrol,jy723/qgroundcontrol,mihadyuk/qgroundcontrol,cfelipesouza/qgroundcontrol,Hunter522/qgroundcontrol,lis-epfl/qgroundcontrol,hejunbok/qgroundcontrol,kd0aij/qgroundcontrol,nado1688/qgroundcontrol,ethz-asl/qgc_asl,jy723/qgroundcontrol,fizzaly/qgroundcontrol,CornerOfSkyline/qgroundcontrol,BMP-TECH/qgroundcontrol,kd0aij/qgroundcontrol,nado1688/qgroundcontrol,devbharat/qgroundcontrol,LIKAIMO/qgroundcontrol,greenoaktree/qgroundcontrol,Hunter522/qgroundcontrol,TheIronBorn/qgroundcontrol,catch-twenty-two/qgroundcontrol,kd0aij/qgroundcontrol,Hunter522/qgroundcontrol,caoxiongkun/qgroundcontrol,dagoodma/qgroundcontrol,fizzaly/qgroundcontrol,greenoaktree/qgroundcontrol,catch-twenty-two/qgroundcontrol,scott-eddy/qgroundcontrol,iidioter/qgroundcontrol,jy723/qgroundcontrol,ethz-asl/qgc_asl,cfelipesouza/qgroundcontrol,catch-twenty-two/qgroundcontrol,cfelipesouza/qgroundcontrol,nado1688/qgroundcontrol,CornerOfSkyline/qgroundcontrol,fizzaly/qgroundcontrol,ethz-asl/qgc_asl,hejunbok/qgroundcontrol,remspoor/qgroundcontrol,dagoodma/qgroundcontrol,dagoodma/qgroundcontrol,CornerOfSkyline/qgroundcontrol,caoxiongkun/qgroundcontrol,caoxiongkun/qgroundcontrol,RedoXyde/PX4_qGCS,scott-eddy/qgroundcontrol,UAVenture/qgroundcontrol,BMP-TECH/qgroundcontrol,hejunbok/qgroundcontrol,hejunbok/qgroundcontrol,TheIronBorn/qgroundcontrol,nado1688/qgroundcontrol,fizzaly/qgroundcontrol,devbharat/qgroundcontrol,LIKAIMO/qgroundcontrol,scott-eddy/qgroundcontrol,LIKAIMO/qgroundcontrol,ethz-asl/qgc_asl,mihadyuk/qgroundcontrol,remspoor/qgroundcontrol,dagoodma/qgroundcontrol,jy723/qgroundcontrol,catch-twenty-two/qgroundcontrol,greenoaktree/qgroundcontrol,caoxiongkun/qgroundcontrol,nado1688/qgroundcontrol