Merge branch 'origin/master'
Reverting json.
Merge branch 'origin/gh-pages'