Update changelog
Merge branch 'develop' into stable