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