Update JavaDocs to match master branch