Automated merge with https://knowledgetap.com/hg/pylons-dev/
Automated merge with https://knowledgetap.com/hg/pylons-dev/

--HG--
branch : trunk

Pylons/pylons,moreati/pylons,Pylons/pylons,moreati/pylons,Pylons/pylons,moreati/pylons