Shun Miyazawa 1df25f5d44 Merge branch 'master' into feat/unified-merge-view 1 anno fa
..
locales 1df25f5d44 Merge branch 'master' into feat/unified-merge-view 1 anno fa