merged forgotten changes

2015-01-16, Edouard Tisserant