fixed routing bug
Merge branch 'master' into switch-reroute

Conflicts:
	src/Web/Spock/Internal/SafeRouting.hs