[MRG] merge with lp:openobject-server