auto merge of #4958 : awlnx/servo/master, r=jdm
auto merge of #4958 : awlnx/servo/master, r=jdm


snf/servo,cbrewster/servo,tafia/servo,mattnenterprise/servo,szeged/servo,snf/servo,eddyb/servo,pyecs/servo,szeged/servo,evilpie/servo,srbhklkrn/SERVOENGINE,A-deLuna/servo,brendandahl/servo,hyowon/servo,indykish/servo,zhangjunlei26/servo,notriddle/servo,caldwell/servo,saneyuki/servo,steveklabnik/servo,SimonSapin/servo,j3parker/servo,DominoTree/servo,SimonSapin/servo,sadmansk/servo,jgraham/servo,nerith/servo,nnethercote/servo,avadacatavra/servo,pyecs/servo,kindersung/servo,dmarcos/servo,peterjoel/servo,eddyb/servo,peterjoel/servo,indykish/servo,tschneidereit/servo,walac/servo,rixrix/servo,WriterOfAlicrow/servo,saneyuki/servo,Adenilson/prototype-viewing-distance,dsandeephegde/servo,anthgur/servo,samfoo/servo,peterjoel/servo,evilpie/servo,nrc/servo,fiji-flo/servo,splav/servo,pgonda/servo,aidanhs/servo,CJ8664/servo,meh/servo,g-k/servo,saneyuki/servo,saneyuki/servo,dhananjay92/servo,bjwbell/servo,emilio/servo,tschneidereit/servo,snf/servo,upsuper/servo,bjwbell/servo,g-k/servo,wpgallih/servo,dsandeephegde/servo,thiagopnts/servo,dagnir/servo,WriterOfAlicrow/servo,larsbergstrom/servo,CJ8664/servo,j3parker/servo,saratang/servo,hyowon/servo,akosel/servo,mt2d2/servo,samfoo/servo,mattnenterprise/servo,walac/servo,ConnorGBrewster/servo,zentner-kyle/servo,emilio/servo,szeged/servo,karlito40/servo,splav/servo,rixrix/servo,anthgur/servo,jdramani/servo,paulrouget/servo,pgonda/servo,mdibaiee/servo,dvberkel/servo,notriddle/servo,snf/servo,CJ8664/servo,caldwell/servo,sadmansk/servo,emilio/servo,akosel/servo,jimberlage/servo,Adenilson/prototype-viewing-distance,hyowon/servo,zhangjunlei26/servo,notriddle/servo,dati91/servo,tempbottle/servo,tempbottle/servo,nerith/servo,luniv/servo,indykish/servo,larsbergstrom/servo,RenaudParis/servo,boghison/servo,upsuper/servo,dhananjay92/servo,j3parker/servo,peterjoel/servo,evilpie/servo,AnthonyBroadCrawford/servo,WriterOfAlicrow/servo,dvberkel/servo,kindersung/servo,aweinstock314/servo,DominoTree/servo,thiagopnts/servo,hyowon/servo,bjwbell/servo,WriterOfAlicrow/servo,emilio/servo,vks/servo,tafia/servo,tafia/servo,cbrewster/servo,zentner-kyle/servo,evilpie/servo,boghison/servo,wartman4404/servo,splav/servo,wpgallih/servo,wpgallih/servo,wpgallih/servo,nick-thompson/servo,walac/servo,dmarcos/servo,notriddle/servo,pyecs/servo,saratang/servo,Adenilson/prototype-viewing-distance,aweinstock314/servo,karlito40/servo,peterjoel/servo,larsbergstrom/servo,meh/servo,runarberg/servo,anthgur/servo,boghison/servo,peterjoel/servo,j3parker/servo,caldwell/servo,GreenRecycleBin/servo,splav/servo,paulrouget/servo,thiagopnts/servo,s142857/servo,mt2d2/servo,mdibaiee/servo,saneyuki/servo,dhananjay92/servo,dagnir/servo,runarberg/servo,jimberlage/servo,ryancanhelpyou/servo,AnthonyBroadCrawford/servo,snf/servo,CJ8664/servo,saratang/servo,pyecs/servo,A-deLuna/servo,aweinstock314/servo,ryancanhelpyou/servo,meh/servo,pyfisch/servo,walac/servo,mdibaiee/servo,s142857/servo,mbrubeck/servo,paulrouget/servo,fiji-flo/servo,kindersung/servo,brendandahl/servo,KiChjang/servo,youprofit/servo,canaltinova/servo,GyrosOfWar/servo,youprofit/servo,karlito40/servo,samfoo/servo,dvberkel/servo,thiagopnts/servo,WriterOfAlicrow/servo,caldwell/servo,nerith/servo,splav/servo,szeged/servo,rentongzhang/servo,nnethercote/servo,nerith/servo,indykish/servo,zhangjunlei26/servo,zhangjunlei26/servo,hyowon/servo,wartman4404/servo,samfoo/servo,dsandeephegde/servo,snf/servo,notriddle/servo,dagnir/servo,echochamber/servo,luniv/servo,splav/servo,dhananjay92/servo,cbrewster/servo,DominoTree/servo,codemac/servo,ryancanhelpyou/servo,dhananjay92/servo,jlegendary/servo,nick-thompson/servo,s142857/servo,srbhklkrn/SERVOENGINE,nnethercote/servo,brendandahl/servo,dati91/servo,pyfisch/servo,upsuper/servo,dati91/servo,anthgur/servo,karlito40/servo,tempbottle/servo,tschneidereit/servo,KiChjang/servo,splav/servo,kindersung/servo,thiagopnts/servo,dati91/servo,jgraham/servo,emilio/servo,jimberlage/servo,peterjoel/servo,jlegendary/servo,akosel/servo,paulrouget/servo,wpgallih/servo,aweinstock314/servo,fiji-flo/servo,pgonda/servo,brendandahl/servo,tafia/servo,jimberlage/servo,saratang/servo,aweinstock314/servo,notriddle/servo,brendandahl/servo,runarberg/servo,srbhklkrn/SERVOENGINE,caldwell/servo,jgraham/servo,fiji-flo/servo,rnestler/servo,indykish/servo,AnthonyBroadCrawford/servo,ConnorGBrewster/servo,Adenilson/prototype-viewing-distance,canaltinova/servo,jlegendary/servo,eddyb/servo,dagnir/servo,fiji-flo/servo,jdramani/servo,upsuper/servo,GyrosOfWar/servo,g-k/servo,echochamber/servo,steveklabnik/servo,canaltinova/servo,akosel/servo,KiChjang/servo,vks/servo,srbhklkrn/SERVOENGINE,mbrubeck/servo,GreenRecycleBin/servo,mattnenterprise/servo,DominoTree/servo,GreenRecycleBin/servo,nrc/servo,szeged/servo,nrc/servo,youprofit/servo,g-k/servo,vks/servo,sadmansk/servo,hyowon/servo,upsuper/servo,deokjinkim/servo,akosel/servo,tafia/servo,KiChjang/servo,s142857/servo,evilpie/servo,jdramani/servo,nick-thompson/servo,thiagopnts/servo,codemac/servo,huonw/servo,akosel/servo,cbrewster/servo,ConnorGBrewster/servo,steveklabnik/servo,notriddle/servo,deokjinkim/servo,avadacatavra/servo,GreenRecycleBin/servo,steveklabnik/servo,saratang/servo,indykish/servo,pyfisch/servo,DominoTree/servo,nrc/servo,mdibaiee/servo,sadmansk/servo,cbrewster/servo,g-k/servo,jdramani/servo,codemac/servo,walac/servo,luniv/servo,RenaudParis/servo,jlegendary/servo,rnestler/servo,fiji-flo/servo,huonw/servo,saneyuki/servo,karlito40/servo,rixrix/servo,cbrewster/servo,dmarcos/servo,KiChjang/servo,dsandeephegde/servo,tempbottle/servo,samfoo/servo,eddyb/servo,rnestler/servo,luniv/servo,CJ8664/servo,nerith/servo,codemac/servo,AnthonyBroadCrawford/servo,eddyb/servo,WriterOfAlicrow/servo,s142857/servo,SimonSapin/servo,cbrewster/servo,eddyb/servo,rnestler/servo,RenaudParis/servo,ConnorGBrewster/servo,ryancanhelpyou/servo,dmarcos/servo,jimberlage/servo,dati91/servo,mt2d2/servo,zhangjunlei26/servo,ryancanhelpyou/servo,bjwbell/servo,canaltinova/servo,DominoTree/servo,GyrosOfWar/servo,larsbergstrom/servo,larsbergstrom/servo,Adenilson/prototype-viewing-distance,snf/servo,A-deLuna/servo,pgonda/servo,larsbergstrom/servo,echochamber/servo,AnthonyBroadCrawford/servo,paulrouget/servo,j3parker/servo,zentner-kyle/servo,meh/servo,mbrubeck/servo,dati91/servo,kindersung/servo,emilio/servo,DominoTree/servo,mdibaiee/servo,karlito40/servo,KiChjang/servo,AnthonyBroadCrawford/servo,huonw/servo,indykish/servo,nnethercote/servo,saratang/servo,emilio/servo,Adenilson/prototype-viewing-distance,karlito40/servo,dhananjay92/servo,echochamber/servo,dagnir/servo,dsandeephegde/servo,pyecs/servo,youprofit/servo,rnestler/servo,emilio/servo,youprofit/servo,dvberkel/servo,A-deLuna/servo,bjwbell/servo,avadacatavra/servo,steveklabnik/servo,jdramani/servo,rixrix/servo,bjwbell/servo,aidanhs/servo,vks/servo,ConnorGBrewster/servo,jgraham/servo,nrc/servo,g-k/servo,peterjoel/servo,deokjinkim/servo,larsbergstrom/servo,tafia/servo,jimberlage/servo,mattnenterprise/servo,mbrubeck/servo,larsbergstrom/servo,wpgallih/servo,zentner-kyle/servo,GyrosOfWar/servo,nrc/servo,paulrouget/servo,boghison/servo,kindersung/servo,KiChjang/servo,sadmansk/servo,dagnir/servo,Adenilson/prototype-viewing-distance,dagnir/servo,rixrix/servo,evilpie/servo,emilio/servo,pyfisch/servo,luniv/servo,brendandahl/servo,tempbottle/servo,paulrouget/servo,akosel/servo,huonw/servo,wartman4404/servo,jdramani/servo,splav/servo,runarberg/servo,tafia/servo,jdramani/servo,huonw/servo,SimonSapin/servo,indykish/servo,notriddle/servo,szeged/servo,rentongzhang/servo,splav/servo,splav/servo,CJ8664/servo,srbhklkrn/SERVOENGINE,mbrubeck/servo,DominoTree/servo,samfoo/servo,RenaudParis/servo,pyecs/servo,rixrix/servo,rentongzhang/servo,tschneidereit/servo,pyfisch/servo,runarberg/servo,wartman4404/servo,peterjoel/servo,GreenRecycleBin/servo,jlegendary/servo,rixrix/servo,canaltinova/servo,meh/servo,nick-thompson/servo,rixrix/servo,szeged/servo,upsuper/servo,dati91/servo,zentner-kyle/servo,walac/servo,jlegendary/servo,youprofit/servo,mdibaiee/servo,indykish/servo,pyfisch/servo,mt2d2/servo,RenaudParis/servo,GyrosOfWar/servo,aidanhs/servo,anthgur/servo,mattnenterprise/servo,huonw/servo,zhangjunlei26/servo,nnethercote/servo,mbrubeck/servo,WriterOfAlicrow/servo,pyfisch/servo,notriddle/servo,deokjinkim/servo,thiagopnts/servo,mt2d2/servo,jlegendary/servo,aweinstock314/servo,GyrosOfWar/servo,huonw/servo,A-deLuna/servo,srbhklkrn/SERVOENGINE,anthgur/servo,wpgallih/servo,avadacatavra/servo,runarberg/servo,rnestler/servo,pgonda/servo,nerith/servo,codemac/servo,SimonSapin/servo,nnethercote/servo,sadmansk/servo,DominoTree/servo,peterjoel/servo,codemac/servo,jimberlage/servo,youprofit/servo,CJ8664/servo,avadacatavra/servo,tschneidereit/servo,steveklabnik/servo,steveklabnik/servo,GreenRecycleBin/servo,nerith/servo,dmarcos/servo,boghison/servo,tschneidereit/servo,mattnenterprise/servo,bjwbell/servo,sadmansk/servo,saneyuki/servo,notriddle/servo,GreenRecycleBin/servo,RenaudParis/servo,wartman4404/servo,boghison/servo,dvberkel/servo,tschneidereit/servo,paulrouget/servo,KiChjang/servo,deokjinkim/servo,canaltinova/servo,aweinstock314/servo,tempbottle/servo,DominoTree/servo,mt2d2/servo,s142857/servo,caldwell/servo,GreenRecycleBin/servo,larsbergstrom/servo,luniv/servo,pyfisch/servo,jgraham/servo,nnethercote/servo,dsandeephegde/servo,echochamber/servo,SimonSapin/servo,runarberg/servo,jimberlage/servo,saneyuki/servo,hyowon/servo,pyecs/servo,aidanhs/servo,nrc/servo,jgraham/servo,rentongzhang/servo,aidanhs/servo,ConnorGBrewster/servo,KiChjang/servo,deokjinkim/servo,anthgur/servo,mattnenterprise/servo,aidanhs/servo,aidanhs/servo,dmarcos/servo,saneyuki/servo,dvberkel/servo,szeged/servo,echochamber/servo,zentner-kyle/servo,SimonSapin/servo,meh/servo,wpgallih/servo,jgraham/servo,rixrix/servo,upsuper/servo,A-deLuna/servo,saratang/servo,ConnorGBrewster/servo,avadacatavra/servo,anthgur/servo,cbrewster/servo,KiChjang/servo,samfoo/servo,canaltinova/servo,rentongzhang/servo,GyrosOfWar/servo,dsandeephegde/servo,zhangjunlei26/servo,ConnorGBrewster/servo,jimberlage/servo,A-deLuna/servo,boghison/servo,walac/servo,dhananjay92/servo,wartman4404/servo,upsuper/servo,mdibaiee/servo,mbrubeck/servo,sadmansk/servo,eddyb/servo,larsbergstrom/servo,vks/servo,canaltinova/servo,wartman4404/servo,j3parker/servo,rnestler/servo,szeged/servo,kindersung/servo,dmarcos/servo,pyfisch/servo,caldwell/servo,meh/servo,nick-thompson/servo,nick-thompson/servo,ryancanhelpyou/servo,vks/servo,nick-thompson/servo,paulrouget/servo,mbrubeck/servo,j3parker/servo,rentongzhang/servo,dvberkel/servo,zentner-kyle/servo,RenaudParis/servo,pyfisch/servo,mt2d2/servo,brendandahl/servo,SimonSapin/servo,vks/servo,evilpie/servo,szeged/servo,zhangjunlei26/servo,nnethercote/servo,eddyb/servo,emilio/servo,paulrouget/servo,zhangjunlei26/servo,evilpie/servo,fiji-flo/servo,GreenRecycleBin/servo,AnthonyBroadCrawford/servo,srbhklkrn/SERVOENGINE,fiji-flo/servo,saneyuki/servo,mattnenterprise/servo,rnestler/servo,tempbottle/servo,codemac/servo,pgonda/servo,echochamber/servo,avadacatavra/servo,dati91/servo,CJ8664/servo,g-k/servo,s142857/servo,avadacatavra/servo,rentongzhang/servo,thiagopnts/servo,luniv/servo,nnethercote/servo,ryancanhelpyou/servo,deokjinkim/servo,nnethercote/servo,evilpie/servo,wpgallih/servo,dsandeephegde/servo,pgonda/servo