Has this patch been merged upstream? I see it's from the SF project, but not clear if it's been merged or not. Can you add a comment noting what it fixes / where it's from? Thanks!