#2566, merged as a single commit, with fixed line endings
revamp
2018-07-20, Edouard Tisserant