Fix pb with filesystem version.

Pointed out by A. Mallet.
Update ChangeLog.
Merge commit 'v2.5.3'
Synchronize