Merge proposals dependent on lp:~camptocamp/ocb-addons/ocb-7.0-fix_1267495-afe

lp:~camptocamp/ocb-addons/ocb-7.0-fix_1267495-afe has no merge proposals.