Update master branch to Java 8