Merge branch 'MDL-51196-text-email-permalink' of https://github.com/brendanheywood...