Merge branch 'master' into schanzen/reclaim_256bit
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 13 Feb 2020 06:59:48 +0000 (07:59 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 13 Feb 2020 06:59:48 +0000 (07:59 +0100)

Trivial merge