Merge pull request #8044 from diizzyy/libs-jsoncpp