[MERGE]: Merge with lp:openobject-trunk-dev-addons2