ruby-2.1.0

Cherry pick for the 2.1.0 release

Conflicts:
	config/db
	config/known
	config/md5