Commit ae7f2174 authored by Marius Burkard's avatar Marius Burkard

Merge branch 'patch-3' into 'master'

Patch 3

See merge request !837
parents 1b0ffe4e 694c2c56
Pipeline #342 passed with stage
in 2 minutes and 38 seconds