Merge branch 'hotfix/20140523-mogera'
4shared-china.com
Merge branch 'hotfix/20140523-china' into develop