Commit 453ac8f0 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release-1.2.5'

parents 9680e54a d21a7bc9