[MERGE] forward port of branch saas-2 up to revid 4992 chs@openerp.com-20131202105848...