Merge pull request #1180 from musashino205/mwan3-upd-ja