That didn't work as expected.
Merge branch 'json' into ajson
Don't know how I missed that while merging...