[MERGE] branch merged with lp:openobject-addons