jdk

45f1b33c - merge latest from master branch