Merge "fix wrong description in text-style" into devel/master