Commit 066b1456 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release-1.2.6' into develop

parents fe2d3d9b bd4f4785