reapplying fix to #499, rolled back by #530
reapplying fix to #499, rolled back by #530

matthewstyers/keystone,jeffreypriebe/keystone,mikaoelitiana/keystone,benkroeger/keystone,benkroeger/keystone,pswoodworth/keystone,everisARQ/keystone,kumo/keystone,creynders/keystone,beni55/keystone,47pages/keystone,mbayfield/keystone,pr1ntr/keystone,davibe/keystone,davidbanham/keystone,kloudsio/keystone,tomasztunik/keystone,gemscng/keystone,Freakland/keystone,danielmahon/keystone,chrisgornall/d29blog,Redmart/keystone,andreufirefly/keystone,snowkeeper/keystone,magalhas/keystone,nickhsine/keystone,wustxing/keystone,pr1ntr/keystone,ligson/keystone,gemscng/keystone,DenisNeustroev/keystone,Freakland/keystone,lojack/keystone,KZackery/keystone,gcortese/keystone,DenisNeustroev/keystone,onenorth/keystone,concoursbyappointment/keystoneRedux,matthieugayon/keystone,jeffreypriebe/keystone,WingedToaster/keystone,suryagh/keystone,alobodig/keystone,sebmck/keystone,tony2cssc/keystone,belafontestudio/keystone,wilsonfletcher/keystone,kumo/keystone,dvdcastro/keystone,beni55/keystone,vokal/keystone,kristianmandrup/keystone,antonj/keystone,asifiqbal84/keystone,chrisgornall/d29blog,efernandesng/keystone,belafontestudio/keystone,kwangkim/keystone,jrit/keystone,Ftonso/keystone,sendyhalim/keystone,Adam14Four/keystone,matthewstyers/keystone,kidaa/keystone,udp/keystone,trentmillar/keystone,tanbo800/keystone,frontyard/keystone,mbayfield/keystone,cermati/keystone,asifiqbal84/keystone,Yaska/keystone,ligson/keystone,naustudio/keystone,WofloW/keystone,Tangcuyu/keystone,joerter/keystone,dvdcastro/keystone,matthewstyers/keystone,magalhas/keystone,trystant/keystone,qwales1/keystone,xyzteam2016/keystone,danielmahon/keystone,the1sky/keystone,akoesnan/keystone,naustudio/keystone,SlashmanX/keystone,rafmsou/keystone,concoursbyappointment/keystoneRedux,lastjune/keystone,wmertens/keystone,joerter/keystone,brianjd/keystone,codevlabs/keystone,everisARQ/keystone,unsworn/keystone,MORE-HEALTH/keystone,mekanics/keystone,webteckie/keystone,tanbo800/keystone,Redmart/keystone,creynders/keystone,rmarji/keystone,codevlabs/keystone,quenktechnologies/keystone,kwangkim/keystone,jrit/keystone,sendyhalim/keystone,sarriaroman/keystone,Yaska/keystone,udp/keystone,ratecity/keystone,naustudio/keystone,ONode/keystone,BlakeRxxk/keystone,douglasf/keystone,tony2cssc/keystone,vmkcom/keystone,stosorio/keystone,SJApps/keystone,trentmillar/keystone,snowkeeper/keystone,lojack/keystone,mikaoelitiana/keystone,stosorio/keystone,dryna/keystone-twoje-urodziny,Tangcuyu/keystone,pswoodworth/keystone,WofloW/keystone,andrewlinfoot/keystone,ratecity/keystone,trentmillar/keystone,MORE-HEALTH/keystone,Pylipala/keystone,Pop-Code/keystone,riyadhalnur/keystone,kristianmandrup/keystone,dryna/keystone-twoje-urodziny,omnibrain/keystone,developer-prosenjit/keystone,onenorth/keystone,Pop-Code/keystone,sarriaroman/keystone,kloudsio/keystone,francesconero/keystone,webteckie/keystone,unsworn/keystone,vokal/keystone,Pylipala/keystone,Yaska/keystone,andrewlinfoot/keystone,jstockwin/keystone,cermati/keystone,developer-prosenjit/keystone,WingedToaster/keystone,francesconero/keystone,wustxing/keystone,woody0907/keystone,nickhsine/keystone,gcortese/keystone,vokal/keystone,riyadhalnur/keystone,efernandesng/keystone,frontyard/keystone,frontyard/keystone,trystant/keystone,andrewlinfoot/keystone,xyzteam2016/keystone,davidbanham/keystone,youprofit/keystone,stunjiturner/keystone,SJApps/keystone,ONode/keystone,andreufirefly/keystone,brianjd/keystone,matthieugayon/keystone,geminiyellow/keystone,alobodig/keystone,w01fgang/keystone,michaelerobertsjr/keystone,wmertens/keystone,kittens/keystone,Adam14Four/keystone,SlashmanX/keystone,w01fgang/keystone,linhanyang/keystone,jstockwin/keystone,benkroeger/keystone,BlakeRxxk/keystone,tomasztunik/keystone,akoesnan/keystone,jacargentina/keystone,omnibrain/keystone,qwales1/keystone,woody0907/keystone,KZackery/keystone,Ftonso/keystone,douglasf/keystone,vmkcom/keystone,suryagh/keystone,lastjune/keystone,stunjiturner/keystone,antonj/keystone,michaelerobertsjr/keystone,geminiyellow/keystone,youprofit/keystone,mekanics/keystone,kidaa/keystone,wilsonfletcher/keystone,the1sky/keystone,rafmsou/keystone,davibe/keystone,danielmahon/keystone,jacargentina/keystone