ws-tcg
Merge branch 'hotfix/20140521-ws'