[MERGE] forward port of branch saas-1 up to revid 3751 chs@openerp.com-20131115104909...