jdk

026256ff - Roberto's feedback applied.