Commit b60f24cc authored by Philip Trettner's avatar Philip Trettner

Merge branch 'master' into develop

parents a30c8963 6d9c650a
Pipeline #12105 passed with stage
in 7 minutes and 37 seconds