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