fix incorrect javadoc comment
Merge branch '2.3.x'