Merge branch 'ah/doc-wserrorhighlight' into maint