version bump for 0.3.1
Merge branch 'stable/0.3.x'

Conflicts:
	CHANGELOG.txt