Update the ChangeLog to reflect the latest changes to the code.
Merge branch 'master' into dev