Merge pull request #12769 from birkirb/master

Boolean parser blows up on a Fixnum.

Conflicts:
	activesupport/CHANGELOG.md

Conflicts:
	activesupport/CHANGELOG.md