Tiny Engine upgrade
Tiny Engine upgrade compatibility tweaks
Merge branch 'master' into mariokart