Update the ChangeLog with the changes in this merge of the dev branch.
Merge branch 'dev'