Text changes
Merge branch 'master' into mf2