[MERGE] Forward-port of saas-4 up to 65b6b81
authorOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 18:55:53 +0000 (20:55 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 18:55:53 +0000 (20:55 +0200)

Trivial merge