[MERGE] Merge with lp:opeobject-addons