Update to 4.3.2 Java8: 4c0efa3
tidyup