Merge "More auto-doc work." into oc-dev