Merge branch 'hotfix/20140710-misc'
leagueoflegends
Merge branch 'hotfix/20140710-misc2' into develop