Merge "Small doc fix." into oc-dev