Last commit before adaptation to Coq-8.4
First commit adapted for the 8.4-8.5 trunk