Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb

spec/fabricators/identity_fabricator.rb

@@ -0,0 +1,5 @@
+Fabricator(:identity) do
+  user     nil
+  provider "MyString"
+  uid      "MyString"
+end