[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-
20140403084524-9rb174osjrbmhgwc
bzr revid: chs@openerp.com-
20140402083506-w4cywcf0kxxx9xmk
bzr revid: chs@openerp.com-
20140312174526-a5rhh83g0fw8djuc
bzr revid: chs@openerp.com-
20140318105837-53vsx5g7fm517cuc
bzr revid: dle@openerp.com-
20140326092548-bu4bqinhvco8j5wj
bzr revid: chs@openerp.com-
20140402092735-3a23yjl169vvt0iv
bzr revid: chs@openerp.com-
20140402112825-ky8rcb3p467ikitc
bzr revid: chs@openerp.com-
20140403084808-slnj7uis17kwi9js