[ticket/59] re-route requests when they look like they need it
Merge pull request #60 from dcz/ticket/59

[ticket/59] re-route requests when they look like they need it