Fix text wrapping issue with long unwrappable lines (#1489371)

Conflicts:

	CHANGELOG