PLAYGROUND-341
Merge branch 'develop' of https://github.com/nicolaslabbe/PlaygroundGame into develop