[MERGE] forward port of branch 7.0 up to revid 9535 odo@openerp.com-20131021124748...