Merge "Minor correction to the javadoc to match implementation" into pi-dev