testGit2
Merge branch 'master' into emiya
Merge branch 'amiya'