Build fix after last commit.
_G is not generator
Merge branch 'master' into generator-assets