Merge branch 'hotfix/20140523-china'
pagoda56
Merge branch 'hotfix/20140523-pagoda' into develop