Tidy up web test output.
Merge origin/master