Merge branch 'master' of https://github.com/melonjs/melonJS
Fixes sync issue