Commit 20cbe7f43c9c9427a4023aaa819bf70655943f54

Authored by Georg Hopp
2 parents 7a3343c8 7272bb6c

Fix conflicts from upstream merge

2 builds in 59 seconds
Status Build ID Ref Stage Name Duration Finished at
 passed next build build
46 seconds
 failed next test coverage:dev
13 seconds