Commit 4659fa4a authored by Luc Maisonobe's avatar Luc Maisonobe
Browse files

Merge branch 'issue-836' into develop

Conflicts:
	src/changes/changes.xml
parents 01a812a7 925c95a8
Pipeline #1654 passed with stages
in 23 minutes and 14 seconds