Favour JSON over XML
Merge branch 'flexible-accept-formats' into develop