Some more tweaks to WebHelp.
Merge branch 'master' into frontdoor