Merge "Line wrap mode property is added." into devel/master