Upgrade to json 1.8.0