Fix jingle version
Merge branch 'master' into v7.0

Conflicts:
	package.json