Update for rustc
Merge branch 'master' of https://github.com/tomaka/from_json