Merge "Even more auto-doc work." into oc-dev