jdk

083068f0 - merge latest from master branch