Merge pull request #12383 from marclennox/master

Fixed issue #12327
Conflicts:
	activerecord/test/cases/base_test.rb