Fixed eof
Removed trailing whitespace from route
Merge pull request #5138 from GrahamCampbell/4.2-cs

[4.2] CS Fixes For Latest Merges