auto merge of #1273 : sammykim/servo/issue-1197, r=jdm
auto merge of #1273 : sammykim/servo/issue-1197, r=jdm

Fix #1197 

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