Merge pull request #1248 from musashino205/tmate-upd-ja