Merged with the default branch.

diff --cc auto/os/linux
Simple merge

diff --cc src/core/ngx_connection.h
Simple merge

diff --cc src/event/ngx_event_udp.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