Merge "Use consistent spaces at start and end of comments"