Merge branch 'master' of github.com:Pylons/pyramid_handlers
fix for pyramid 1.4