Commit 5c33a4fb authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch '6.x' 

# Conflicts:
#	CHANGELOG.md
parents 1405b667 663090c6