Merge "Fix documentation bug that breaks generation" into pi-dev