[MERGE] Merge with lp:openobject-addons