WIXBUG:4125

Clarify doc.
Merge branch 'develop' into bug.4125

Conflicts:
	History.md
Merge pull request #40 from barnson/bug.4125

WIXBUG:4125