Import json frmo Python stdlib, not Flask.
Merge branch 'master' into solution