Commit d2f7c095 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'bsv-next' 

# Conflicts:
#	CHANGELOG.md
parents d831182a 37af6559