Merged in Andrey's branch

2018-09-12, Edouard Tisserant