Disable hooks only on update.
Update the changelog and add missing entries.
Merge branch 'master' into develop

Conflicts:
	CHANGELOG.md