cherry-pick release v0.2.1

Conflicts:
	metadata.rb