rather a large commit, replaced cherrypy with a newer version, had to monkey patch it so it would work