Merge branch 'master' of https://github.com/Atoile/tgames.git