Merge proposals dependent on lp://staging/~scigghiateam/openobject-addons/fix_bug_1028287

lp://staging/~scigghiateam/openobject-addons/fix_bug_1028287 has no merge proposals.