Upgraded JSON gem.
Merge branch 'master' into i18n