[MERGE] lp:~xrg/openobject-addons/trunk-patch18