Merge branch 'hotfix/20140910-yuyutei'
WoW patch
Merge branch 'hotfix/20140911-wow' into develop