Merge branch 'et/http-proxyauth' into maint