Fix a bug in the WSGI entrypoint.
Merge remote-tracking branch 'origin/next'