tweaked previous merge
tweaked previous merge

arduanov/Silex,Xephi/Silex,CarsonF/Silex,mTorres/Silex,mathroc/Silex,lyrixx/Silex,GromNaN/Silex,JPry/Silex,romainneutron/Silex,akucherevskiy/developex_test,Incognito/silex-fork,GromNaN/Silex,cgsmith/Silex,fhinkel/Silex,naderman/Silex,lyrixx/Silex,akucherevskiy/developex_test,jdreesen/Silex,peterkokot/Silex,arduanov/Silex,lokhman/Silex,CarsonF/Silex,romainneutron/Silex,Tobion/Silex,mmauri04/Silex,naderman/Silex,SpacePossum/Silex,naderman/Silex,SanderKnape/Silex,romainneutron/Silex,Incognito/silex-fork,plotek/Silex,cesarmarinhorj/Silex,plotek/Silex,Xephi/Silex,fabpot/Silex,beealone/Silex,SpacePossum/Silex,peterkokot/Silex,tcx1000/Silex,fhinkel/Silex,JPry/Silex,beealone/Silex,RayRutjes/Silex,peterkokot/Silex,tcx1000/Silex,mmauri04/Silex,GromNaN/Silex,mathroc/Silex,silexphp/Silex,gencer/Silex,lokhman/Silex,RayRutjes/Silex,akucherevskiy/developex_test,lyrixx/Silex,fabpot/Silex,cgsmith/Silex,Tobion/Silex,SanderKnape/Silex,mTorres/Silex,cesarmarinhorj/Silex,CarsonF/Silex,Tobion/Silex,jdreesen/Silex