[MERGE] Merge lp:openobject-addons.