Merge branch 'master' into share-dialog-take-2
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Mon, 19 Nov 2018 18:33:05 +0000 (19:33 +0100)
committerGitHub <noreply@github.com>
Mon, 19 Nov 2018 18:33:05 +0000 (19:33 +0100)

Trivial merge