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

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