multi-branch build
Merge branch 'master' into stable-keys

Conflicts:
	Rakefile