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)
commit51829bfb4771567e2350efe5d25db0b563da6e54
tree005e2bdd2e458090cc9a948b0c47feef7ffc84f4
parent76b9d5c0c32c729437779ac32951ece29866768c
parent6dfe160cefef51de01966b0124ac05884c378ba4
Merge branch 'master' into disco-support