Merge "Minor fixes for Text." into devel/master