[MERGE] lp:~openerp-dev/openobject-server/trunk-sloppy-rng-jam-validate-aja