Merge pull request #629 from pruiz/syswebrouting-fixes2