Updated routing-related view helpers.
Merge remote-tracking branch 'origin/master'