Minor javadoc update
Merge branch 'release'