Update CHANGELOG
Merge branch 'master' into helios-sunit