Fix changelog
Merge branch 'master' into issue_381