also suppress newlines in fields
Merge branch 'maint-0.4'

Conflicts:
	doc/changelog.rst
minor
fix bad merge
Merge branch 'maint-0.4'