Commit c989927e authored by Christoph Haas's avatar Christoph Haas

Merge branch 'master' into 'master'

some cleanup

See merge request !1
parents c1be05dc 4062d6fd
Pipeline #947 canceled with stages