Merge branch 'master' into disco-support
authorIstván Váradi <ivaradi@users.noreply.github.com>
Mon, 7 Jan 2019 08:40:39 +0000 (09:40 +0100)
committerGitHub <noreply@github.com>
Mon, 7 Jan 2019 08:40:39 +0000 (09:40 +0100)

Trivial merge