Merge "Allow API results to wrap long lines"