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