Merge branch 'master' of https://github.com/Pylons/waitress into del_warnings