Add Master changes to lua-dev