Fix conflicts master

I've fix previous conflicts.
Please check if all is good : especially Jacob and Nicolas. Check your modifications please.
It would be great to merge this Pull Request as fast as possible.