Merge branch 'hotfix/20140916-steam'
arithgame
Merge branch 'hotfix/20140917-arithgame' into develop