Merge "API docs tidy up"