Merge "Flesh out more API docs." into oc-dev