latest from upstream: paulfurley