Merge branch 'master' of github.com:Pylons/pyramid
Tres committed this by mistake