Checking in JDK so I can get it on my machine at home... I'm sure that there's a better way buut we'll see what happens
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'