[MRG] merge with lp;Openobject-addons