Merge branch 'master' into lua-coroutine-model

diff --cc src/lua/lua_common.h
Simple merge

diff --cc src/lua/lua_config.c
Simple merge

diff --cc src/lua/lua_dns.c
Simple merge