Merge branch 'json-lib-net-framework-2.0' into release-1.7.5-patches