Merge "Text clean." into devel/master