Merge remote-tracking branch 'origin/bump-sso'

Conflicts:
	Gemfile.lock