jdk update
minor: git fork
Merge remote-tracking branch 'upstream/master'