[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1 bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am