merge upstream wsgi-handler