Merge changes to wsgi code