Update changelog
Merge branch 'release' into develop

Merge in changelog updates