Adapt changes to backported commits.
Adapt changes to backported commits.

maximedenes/coq,ejgallego/coq,ppedrot/coq,gares/coq,gares/coq,Zimmi48/coq,JasonGross/coq,gares/coq,maximedenes/coq,JasonGross/coq,maximedenes/coq,JasonGross/coq,gares/coq,Zimmi48/coq,Matafou/coq,ejgallego/coq,gares/coq,silene/coq,ppedrot/coq,SkySkimmer/coq,SkySkimmer/coq,silene/coq,coq/coq,Zimmi48/coq,maximedenes/coq,SkySkimmer/coq,ppedrot/coq,SkySkimmer/coq,maximedenes/coq,coq/coq,JasonGross/coq,ppedrot/coq,coq/coq,ppedrot/coq,Zimmi48/coq,ejgallego/coq,ejgallego/coq,Matafou/coq,Matafou/coq,coq/coq,silene/coq