Java 8
Merge branch 'cuttingedge'