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