Merge "Simplify Javadoc for easier parsing." into pi-dev