Updates per RM #2305.  Supersedes GH pull request #98.
Merge branch 'MarvinJ-contact_us'