Merge branch 'release/0.4.20'
Update ruby gem versions
Merge branch 'hotfix/0.4.21' into develop

Conflicts:
	Gemfile
	Gemfile.lock