[Merge] MERGED lp:openobject-addons.