Merge branch 'thomie-normalise'