Commit 9680e54a authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release-1.2.6'

parents a5600266 bd4f4785