Merge proposals dependent on lp://qastaging/~acsone-openerp/openobject-addons/6.1-fixes

lp://qastaging/~acsone-openerp/openobject-addons/6.1-fixes has no merge proposals.