Merge branch 'customHeaders'
Merge branch 'upstreamMaster'

Conflicts:
	README
	man/Makefile.am
	src/Makefile.am