Merge "Bug 6679 - api explorer creates false examples"