Merge "Fix documentation." into pi-dev