Merge branch 'master' into owncloud
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Tue, 10 Sep 2019 09:03:39 +0000 (11:03 +0200)
committerGitHub <noreply@github.com>
Tue, 10 Sep 2019 09:03:39 +0000 (11:03 +0200)

Trivial merge