Make comment match implementation
Merge remote-tracking branch 'upstream/master' into master-fix-javadoc-for-java-8