Commit 4b384b92 authored by Luc Maisonobe's avatar Luc Maisonobe

Merge branch 'issue-776' into develop

Conflicts:
	src/changes/changes.xml
parents 26d003b1 3380d717
Pipeline #1034 passed with stages
in 31 minutes and 48 seconds