Update to encoding/json ef3ed5705640