auto merge of #2464 : glennw/servo/issue-2161, r=pcwalton
auto merge of #2464 : glennw/servo/issue-2161, r=pcwalton


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