jdk

248eaccf - Merge branch 'master' into patch-15