Merge branch 'master' into trexcl
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Wed, 9 Oct 2019 23:12:48 +0000 (01:12 +0200)
committerGitHub <noreply@github.com>
Wed, 9 Oct 2019 23:12:48 +0000 (01:12 +0200)

Trivial merge