Bump version to 0.4.0.
Merge branch 'master' into feature/bump-0.4

Conflicts:
	setup.py