Merge "Fix documentation." into nyc-mr1-dev