Java7用にコードを変更
Merge branch 'master' into java7
Merge branch 'master' into java8