Merge branch 'master' into owncloud
authortuxmaster5000 <837503+tuxmaster5000@users.noreply.github.com>
Tue, 16 Oct 2018 07:35:33 +0000 (09:35 +0200)
committerGitHub <noreply@github.com>
Tue, 16 Oct 2018 07:35:33 +0000 (09:35 +0200)

Trivial merge