auto merge of #4930 : psdh/servo/sync, r=Manishearth
auto merge of #4930 : psdh/servo/sync, r=Manishearth

Fixes #4916

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