[MRG] merge with lp:openobjet-addons