Merge branch 'dev'
Changelog typos