am 01252217: Merge "Fix javadoc." into klp-modular-dev

* commit '01252217a5d779c885645028a5df70215e7be4f4':
  Fix javadoc.