Merge remote-tracking branch 'origin/master' into issue48
Merge branch 'issue48' into issue9
汉化