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)
commit76b9d5c0c32c729437779ac32951ece29866768c
treedfa575778c33c43b44f2716ee1388c88f58aa683
parent188125dd88f855fd2bc71d030d452be0a5c3ba6f
parent51d349f5272a0676e84563d81643f1c9f18b2af6
Merge branch 'master' into disco-support