Prevent "pid ref'ed before assignment" error in cherrypy.
Merge branch 'nalanda-rct2' into nalanda