Master

Update master to the latest version of json branch.