Merge branch 'master' into translate_ja