fix typo (blame: beer)
Merge branch 'nginx_proxy_http' into amalgamated_modz