#304 parse querystring correctly in routed links
Merge remote-tracking branch 'origin/next' into next