Fix broken test
Merge branch 'master' of https://github.com/nergal/php-bottle