[MERGE] Sync with lp:openobject-addons/7.0