Merge branch 'changelog' into 'develop'