Revert ""

This reverts commit f5d22767a6a933ed1ebaa4125ff7c80e3b6bc2a2.
Revert "Revert """

This reverts commit e52a37b34348670ef668cca362c2b2a0650a7e97.
s
s
Merge branch 'master' of https://github.com/Bizman/Gille_Laurent_Fauvel.git