Merge pull request #856 from madewokherd/textcontrol