merged forgotten changesets

2015-06-15, Edouard Tisserant