Merge branch 'master' into itp.
Main change is the type of json value which I changed in master and did not follow in ITP. Now record are not sent as List. They are maps as in master. This is quite a big change as json_util completely changes.
Showing with 2329 additions and 608 deletions