7a0c6e0 Use updated upstream patch

Authored and Committed by Richard Hughes a year ago
    Use updated upstream patch