Spacing fix
Make Json safe to use during static initialization.
Add const to comparisons
Merge pull request #1 from CodeFridge/feature/const

Add const to comparisons
Merge pull request #1 from dropbox/master

sync from upstream