[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-20140403084524...