Merge branch 'master' into '2.6.1-dev'
# Conflicts: # Readme.md
WARNING! Gitlab maintenance operation scheduled for Thursday, 18 June between 19:00 and 20:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
# Conflicts: # Readme.md