Merge branch '2.6.1-dev' into 'master'
Merge 2.6.1-dev branch See merge request !11
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
Merge 2.6.1-dev branch See merge request !11