Merge branch 'master' into ivan/remote-size-retrieved-race-condition
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Mon, 16 Sep 2019 17:17:00 +0000 (19:17 +0200)
committerGitHub <noreply@github.com>
Mon, 16 Sep 2019 17:17:00 +0000 (19:17 +0200)

Trivial merge