64752e5 Update patch from Ming to match latest upstream submission

Authored and Committed by jforbes 8 years ago
    Update patch from Ming to match latest upstream submission