Merge pull request #14915 from juanpastas/patch-1

Update mapper.rb

[ci skip]

Conflicts:
	actionpack/lib/action_dispatch/routing/mapper.rb