Merge branch 'hotfix/20141210-steam'
pokecheck
Merge branch 'hotfix/20141210-pokecheck' into develop