Merge pull request #151 from Urinophoria/master

August 24 patches for Slim-Framework.patch broke