Fix routing of CatchAll tokens
Merge pull request #913 from Daniel15/fix-catchall-routing-master

Fix routing of CatchAll tokens (Bug #17960) - on master