Pulling in xmunoz's changes to json