Merge "Fix a spelling." into oc-dev