Merge branch 'master' of C:\Work\Sandbox\gamello with conflicts.
Merge branch 'master' of https://github.com/Luftzig/gamello