rails/rails — pull request #18023 by agrobbin (2014-12-13 21:05:49+00:00)
Title: Allow URL helpers to work with optional scopes

Backport of #18022.

Conflicts:
actionpack/CHANGELOG.md