Merge "Fix malformed Javadoc." into pi-dev