Merge branch 'master' into vstakhov-utf8-mime

diff --cc src/libserver/cfg_file.h
Simple merge

diff --cc src/libserver/cfg_rcl.cxx
Simple merge

diff --cc src/libserver/cfg_utils.cxx
Simple merge

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