Comment 32 for bug 1179955

Looks like patch was merged into upstream master. Not certain whether it's been released anywhere.