First step towards using new json format (INCOMPLETE)
Merge remote-tracking branch 'origin/master'