Comment 16 for bug 1330037

Fixed in upstream git