The patch used to fix bnc 1024015 works but is not upstreamable and there's no better solution yet. I see the patch commented out in master and stable branches, so I'll refresh it and push the branches to be merged.