Merge branch 'master' into qt5.5-compat
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Thu, 7 Nov 2019 14:49:43 +0000 (15:49 +0100)
committerGitHub <noreply@github.com>
Thu, 7 Nov 2019 14:49:43 +0000 (15:49 +0100)

Trivial merge