Merge branch 'lua_ob2'