Merge branch 'rm-fix-secret-token-fallback'

Conflicts:
	railties/CHANGELOG.md