Merge 0.9->0.10

diff --cc core/modulemanager.lua
index 2e488fd5e4556c061aa9c0734bdb87cb4441edf3,cddab6472bee107bfe6f237c080b2c2b404e8d52..eb1ce733868e09310a60c919738ccada9161d4ac
--- 1/core/modulemanager.lua
--- 2/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@@ -29,8 -29,8 +29,8 @@@ pcall = function(f, ...
        return xpcall(function() return f(unpack(params, 1, n)) end, function(e) return tostring(e).."\n"..debug_traceback(); end);
  end
  
 -local autoload_modules = {"presence", "message", "iq", "offline", "c2s", "s2s"};
 +local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s"};
- local component_inheritable_modules = {"tls", "dialback", "iq", "s2s"};
+ local component_inheritable_modules = {"tls", "saslauth", "dialback", "iq", "s2s"};
  
  -- We need this to let modules access the real global namespace
  local _G = _G;

diff --cc plugins/mod_saslauth.lua
Simple merge

diff --cc prosodyctl
Simple merge