Code-review updates.
Merge branch 'master' into ruby-json