Javadoc
Merge upstream/master