Merge "javadoc spelling fix"