Merge pull request #1321 from omidraha/patch-1

Improving `X-Vhm-Root` paragraphs.
Merge pull request #1324 from stevepiercy/1.5-branch

backport PR #1321