jdk

cf75c0a6 - more feedback from johan