Fixed typos in changelog
Merge branch 'dev'