Merge pull request #6497 from stokito/LUA_TARGET