refs 8933 refactoring
Merge branch 'master' of github.com:MiraitSystems/enju_trunk