Apply parameters to just the current route, rather than every route in the tree. This fixes an issue which was causing a child {parameter} to be overwritten by a parent {parameter} with the same name.
Merge branch 'master'