[sr-dev] git:master:554a0d44: Merge pull request #2513 from gaaf/features/jansson-xavp