partially reverted previous merge
partially reverted previous merge

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