Javadoc update
Merge branch 'gh-pages-new' into gh-pages