Merge proposals dependent on lp:~openerp-dev/openerp-web/trunk-bug-1253518-psa

lp:~openerp-dev/openerp-web/trunk-bug-1253518-psa has no merge proposals.