Update link for javadoc
Merge branch 'master' into develop