Merge branch 'master' into cstdint-fix
authorIstván Váradi <ivaradi@users.noreply.github.com>
Sat, 15 Aug 2020 10:56:13 +0000 (12:56 +0200)
committerGitHub <noreply@github.com>
Sat, 15 Aug 2020 10:56:13 +0000 (12:56 +0200)

Trivial merge