Merge branch 'upstream-jsoncpp' into update-jsoncpp * upstream-jsoncpp: jsoncpp 2020-09-25 (9059f5ca)