Merge branch '3.7.1-dev' into 'master'
3.7.1 dev See merge request !22
WARNING! Gitlab maintenance operation scheduled for Saturday 28th March from 8 a.m. (CET) to approximately 3 p.m. (CET). GitLab will be unavailable during this time.
3.7.1 dev See merge request !22