Merge proposals dependent on lp:~camptocamp/ocb-addons/7.0-fix-1309105

lp:~camptocamp/ocb-addons/7.0-fix-1309105 has no merge proposals.