Fix bug where lua and conf.lua were found, but t.version was not specified
Merge branch 'master' into android