refs 5786 不要な処理の修正
refs 5744 merge
refs 5744 merge
Merge branch 'issue5744' of github.com:nakamura-akifumi/enju_trunk into issue5744