Merge proposals dependent on lp:~openerp-dev/openobject-server/6.1-bug-1013566-odo

lp:~openerp-dev/openobject-server/6.1-bug-1013566-odo has no merge proposals.