Fixed #836
Merge branch 'master' of https://github.com/codecombat/codecombat