Updated language for Waiver document.
Merge branch 'master' into david_waiver