[MERGE] lp:~openerp-dev/openobject-addons/trunk-sloppy-rng-jam-remove-type-tch