Merge proposals dependent on lp://staging/~pedro.baeza/openobject-addons/fix-lp_1254631

lp://staging/~pedro.baeza/openobject-addons/fix-lp_1254631 has no merge proposals.