Merge branch 'master' into disco-support
authorIstván Váradi <ivaradi@users.noreply.github.com>
Sun, 6 Jan 2019 15:53:46 +0000 (16:53 +0100)
committerGitHub <noreply@github.com>
Sun, 6 Jan 2019 15:53:46 +0000 (16:53 +0100)

Trivial merge