[Merge] Merge with lp:openobject-addons