Commit 6d6e00bc authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'master' into '6.x' 

# Conflicts:
#   README.md
parents e4413929 53489a1d

There are no changes