Fix deprecationwarning
Improve docstring
Merge branch 'development' of https://github.com/TurboGears/tg2 into development
Fix deprecationwarning