Commit e66fcd7c authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release_6.0.4'

parents a2453b81 1d563184