cherry-pick release v0.3.1

Conflicts:
	package.json