Merge branch 'hotfix/20140423-srworld'
LoL
Merge branch 'hotfix/lol' into develop