Backport of 0.2.3 for Squeeze by BlaBlaCar