Support building with Java8
Merge branch 'master' into sasl