pokecheck
Merge branch 'hotfix/20141210-pokecheck'