Merge branch 'master' into Japanese
Remaining
Merge branch 'Japanese'