jdk

042b76ca - merge latest from master branch