Merge branch 'master' into schanzen/reclaim_256bit
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 12 Feb 2020 21:09:29 +0000 (22:09 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 12 Feb 2020 21:09:29 +0000 (22:09 +0100)

Trivial merge