auto merge of #1512 : zmike/servo/master, r=larsbergstrom
auto merge of #1512 : zmike/servo/master, r=larsbergstrom



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