Merged with the default branch.

diff --cc src/http/ngx_http.c
Simple merge

diff --cc src/http/ngx_http_core_module.c
Simple merge

diff --cc src/http/ngx_http_core_module.h
Simple merge

diff --cc src/http/ngx_http_request.c
Simple merge

diff --cc src/http/ngx_http_upstream.c
Simple merge

diff --cc src/stream/ngx_stream.c
Simple merge

diff --cc src/stream/ngx_stream.h
Simple merge

diff --cc src/stream/ngx_stream_core_module.c
Simple merge