Commit 2efc83d0 authored by Alexandre Goldstein's avatar Alexandre Goldstein

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

Support/2.6.x

See merge request !577
parents abf88588 ae2ff6f7
Pipeline #9372 failed with stages