Update CHANGELOG
Merge branch 'master' into grafana_scripts

Conflicts:
	CHANGELOG.md