jdk

4c857411 - merge latest from master branch