[BUGFIX beta] #4474 - Assertion when using 'basic' as a route or resource name.

[BUGFIX beta] #4474 - Assertion when using 'basic' as a route or resource name.

Foo

Foo
Merge pull request #4475 from gordonkristan/master

[BUGFIX beta] Potential solution for #4474.