Fixes #2242 #2243
Fixes #2242 #2243

milkyway-git/thebuggenie,deshion/thebuggenie,Rvanlaak/thebuggenie,praveenscience/thebuggenie,stolenbike/thebuggenie,gabor-udvari/thebuggenie,SamMousa/thebuggenie,SysBind/thebuggenie,dachaac/thebuggenie,thebuggenie/thebuggenie,nrensen/thebuggenie,thebuggenie/thebuggenie,nrensen/thebuggenie,SysBind/thebuggenie,LogosLabs/thebuggenie,thebuggenie/thebuggenie,azaghal/thebuggenie,stolenbike/thebuggenie,JonathanRH/thebuggenie,LogosLabs/thebuggenie,dachaac/thebuggenie,azaghal/thebuggenie,SamMousa/thebuggenie,Rvanlaak/thebuggenie,SysBind/thebuggenie,milkyway-git/thebuggenie,SamMousa/thebuggenie,nrensen/thebuggenie,azaghal/thebuggenie,JonathanRH/thebuggenie,dachaac/thebuggenie,JonathanRH/thebuggenie,SamMousa/thebuggenie,praveenscience/thebuggenie,gabor-udvari/thebuggenie,deshion/thebuggenie,stolenbike/thebuggenie,hurie/thebuggenie,deshion/thebuggenie,milkyway-git/thebuggenie,LogosLabs/thebuggenie,hurie/thebuggenie,milkyway-git/thebuggenie,nrensen/thebuggenie,praveenscience/thebuggenie,SysBind/thebuggenie,thebuggenie/thebuggenie,JonathanRH/thebuggenie,azaghal/thebuggenie,stolenbike/thebuggenie,gabor-udvari/thebuggenie,Rvanlaak/thebuggenie,deshion/thebuggenie,hurie/thebuggenie,hurie/thebuggenie,Rvanlaak/thebuggenie,dachaac/thebuggenie,praveenscience/thebuggenie,gabor-udvari/thebuggenie,LogosLabs/thebuggenie,thebuggenie/thebuggenie