Merge Kosa's work on LuaDocer