jdk

7cf404ea - merge latest from master branch