Commit 3639d6a0 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch '6.0.x'

parents d45e23a1 88a27abe