"text" was added
Merge branch 'erics-horrible-stuff'