Simplify make_str() for Py3.
Merge remote-tracking branch 'upstream/master' into hagberg/json-str