Oops. Valid json would be nice.
Merge pull request #3130 from drewfreyling/master

Oops. Valid json would be nice.