Merge pull request #10121 from BKPepe/werkzeug