Various: Updated text API changes
Merge pull request #542 from z16/4.1

Various: Updated text API changes