fixes the changelog build
Merge branch 'master' into ubuntu

Conflicts:
	Makefile.am