[MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552...