Actually got rid of the embedded JDK.
Merge remote-tracking branch 'origin/master'