Merge "Fixes some javadoc."