Merge, with surprizingly little conflicts

2018-11-23, Edouard Tisserant