Tidy CHANGELOG
Merge branch 'dev'