Merge branch 'master' of https://github.com/owncloud/client
authorRoeland Jago Douma <roeland@famdouma.nl>
Wed, 18 Oct 2017 19:03:15 +0000 (21:03 +0200)
committerRoeland Jago Douma <roeland@famdouma.nl>
Wed, 18 Oct 2017 19:03:15 +0000 (21:03 +0200)

Trivial merge