jdk

246042f9 - merge latest from master branch