Commit 6bbc535d authored by Alexandre Morin's avatar Alexandre Morin

Merge branch 'Support/2.5.X' into 'master'

Support/2.5.x

See merge request !379
parents 9d9fdd31 35873253
Pipeline #5674 passed with stage
in 8 minutes and 38 seconds