Update CONTRIBUTING.md
Update CHANGES.md
Merge branch 'master' into hooks