Commit 0a9aef5e authored by Thomas Urban's avatar Thomas Urban

Merge branch 'master' into develop

parents a6a7059b 8a69c791
Pipeline #2199 passed with stage
in 22 seconds