Merge pull request #4289 from Tiboris/jansson-update