Merge pull request #15699 from sgrif/sg-4-1-custom-types

User defined types should not raise an error

Conflicts:
	activerecord/CHANGELOG.md