bump version to 3.0.4
Merge branch 'release/3.0.4' into release/3.0

Conflicts:
	doc/CHANGELOG.md