Merge branch 'master' into ivan/remote-size-retrieved-race-condition
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Wed, 11 Sep 2019 20:56:34 +0000 (22:56 +0200)
committerGitHub <noreply@github.com>
Wed, 11 Sep 2019 20:56:34 +0000 (22:56 +0200)

Trivial merge