Merge pull request #984 from musashino205/base-upd-ja