Merge "Change formatting of API documentation"