Merged with the default branch.

diff --cc auto/modules
Simple merge

diff --cc src/event/ngx_event.c
Simple merge

diff --cc src/event/ngx_event_openssl.c
Simple merge

diff --cc src/http/modules/ngx_http_ssl_module.c
Simple merge