[MERGE] merge with lp:openobject-server