Merge pull request #2823 from milani/luajit