Auto-Merge pull request #2938 from octo/ff/format_json