Upstream: Text fixes from Chris Staub