Merge proposals dependent on lp:~openerp-dev/openobject-server/trunk-forward-port-mat

lp:~openerp-dev/openobject-server/trunk-forward-port-mat has no merge proposals.