Merge pull request #5541 from totten/4.6-webtest-rest