Remove trailing tabs
Fix wire protocol's need for to_json method
Merge branch 'hotfix/to-json' into develop