inria IP numbering has changed + merged tweaks from trunk