Syncing with master
Merge branch 'master' of https://github.com/BigHedGames/shape-master