Merge pull request #2699 from pruiz/integrate-syswebrouting-master