Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-960982-amp

lp:~openerp-dev/openobject-addons/trunk-bug-960982-amp has no merge proposals.