Merge 2.1.0 #1628

Job	Run time
postgres_test	2m 24s
lint	1m 25s
mongodb_test (gemfiles/mongoid_6.gemfile)	2m 8s
mongodb_test (gemfiles/mongoid_7.gemfile)	1m 45s
javascript_test	2m 3s
system_tests	2m 36s
test (Gemfile, 3.1)	49s
test (gemfiles/rails_4.2.gemfile, 2.4, 1)	2m 21s
test (gemfiles/rails_5.2.gemfile, 2.7)	1m 58s
test (gemfiles/rails_7.0.gemfile, 3.1)	1m 27s
test (gemfiles/rails_master.gemfile, 3.1)	2m 55s
test (gemfiles/rails_7.0.gemfile, 3.2)	1m 34s
test (gemfiles/rails_master.gemfile, 3.2)	1m 55s
	25m 20s

Provide feedback