Update CHANGELOG;
Update CHANGELOG;
Merge branch 'master' into gh-pages