Merge 0.9 -> 0.10

diff --cc plugins/mod_admin_telnet.lua
Simple merge

diff --cc plugins/mod_s2s/s2sout.lib.lua
Simple merge