Merge branch 'master' into windows-large-app-icon
authorOskar Kruschitz <hiiamok@users.noreply.github.com>
Tue, 4 Sep 2018 06:35:11 +0000 (08:35 +0200)
committerGitHub <noreply@github.com>
Tue, 4 Sep 2018 06:35:11 +0000 (08:35 +0200)

Trivial merge