Fidxed route reregistration issue
Merge branch 'hotfix/2014.05.19.1'