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