Merge branch 'hotfix/0513fix' into develop

なおし