Merge proposals dependent on lp://staging/~bruno-bottacini/openobject-italia/6.1-fix-bug-1167773

1. 6.1-fix-bug-1167773
2. Dependent merge proposals