Fixed name in changelog
Merge branch 'master' into phpcs-fixer