pls
merge?
pleasee
Merge branch 'Java8'
Merge branch 'master' into Java8