Comment 13 for bug 1227027

@Xavier: do you have a master fix proposed somewhere already ?