Commit 1906a0ae authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'v1.0.2_cherrypicking' into 'v1.0-stable'

V1.0.2 cherrypicking

See merge request !247
parents f3001623 179ed2db
Pipeline #1531428 failed with stages
in 5 minutes and 6 seconds