Commit c284e9be authored by Alexandre Morin's avatar Alexandre Morin

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

Support/2.5.x

See merge request !349
parents b3423126 f6778017
Pipeline #5151 passed with stage
in 8 minutes and 43 seconds