Upgraded all relevant libraries and switch to JDK 1.8 - this will require more testing.