Merge 0.10->trunk

diff --cc core/moduleapi.lua
index 30d284186bf8e2de379d383df7be81f4c64623a8,e5f86b377f3995b41b154b1404e649275808bc55..e9609ed9aed477d21efdf9d0f8e0f0ad610f95ea
--- 1/core/moduleapi.lua
--- 2/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@@ -17,10 -17,9 +17,11 @@@ local resolve_relative_path = require"u
  
  local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
  local error, setmetatable, type = error, setmetatable, type;
 -local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack;
 +local ipairs, pairs, select = ipairs, pairs, select;
  local tonumber, tostring = tonumber, tostring;
+ local require = require;
 +local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2
 +local unpack = table.unpack or unpack; -- renamed in 5.2
  
  local prosody = prosody;
  local hosts = prosody.hosts;