Fix error reporting
Changelog
bump version
Changelog
Merge branch 'maint' into dev

Conflicts:
	doc/changelog.rst