Merge pull request #2781 from nextcloud/cherry_pick_2020_w53
authorKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 30 Dec 2020 18:00:19 +0000 (19:00 +0100)
committerGitHub <noreply@github.com>
Wed, 30 Dec 2020 18:00:19 +0000 (19:00 +0100)
Cherry pick 2020 w53


Trivial merge