jdk

47e3c33a - merge latest from master branch