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