minor fix to javadoc
Merge origin/master