Fix doc bug 4598 while backporting some things from wix4.
Merge pull request #176 from rseanhall/4598

Fix doc bug 4598 while backporting some things from wix4.