Commit b2d60116 authored by Matthias Clasen's avatar Matthias Clasen

Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master

See merge request !2746
parents c0aa1c8a 5fe83748
Pipeline #224760 passed with stages
in 16 minutes and 47 seconds