Merge branch 'master' into owncloud
authorCamila Ayres <smayres@gmail.com>
Sun, 14 Oct 2018 14:13:01 +0000 (16:13 +0200)
committerGitHub <noreply@github.com>
Sun, 14 Oct 2018 14:13:01 +0000 (16:13 +0200)

Trivial merge