merge WSGI changes