Merge "Note that some Text propeties in devel api can't be changed" into devel/master