Updated to the API json-1.0 branch.

Updated to the json-1.0 branch on the API upstream.