Text changes.
Merged from master.