Javadoc changes
Merge pull request #1064 from jaceklaskowski/javadoc-changes

Javadoc changes