Text edits for Shariq (@hashme).
Merge branch 'hotfix/shariq-text'