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