Merge branch 'master' of github.com:Pylons/pyramid
remove lie
Merge remote-tracking branch 'upstream/master'