auto merge of #3863 : Ms2ger/servo/cleanup-caption, r=Manishearth
auto merge of #3863 : Ms2ger/servo/cleanup-caption, r=Manishearth


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