Merge proposals dependent on lp:~openerp-dev/openobject-server/trunk-bug-823691-nch

lp:~openerp-dev/openobject-server/trunk-bug-823691-nch has no merge proposals.