[MERGE] Forward-port saas-3 up to daaef17
authorOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 15:50:03 +0000 (17:50 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 15:50:34 +0000 (17:50 +0200)

Trivial merge