Merge "documentation fixes" into nyc-mr1-dev