merge of '22c256e152c9765e98afa4d164af3f6783e96257'      and '561b7dbb17d3809ca98a31b718ee55ae9d52cb2c'
merge of '22c256e152c9765e98afa4d164af3f6783e96257'
     and '561b7dbb17d3809ca98a31b718ee55ae9d52cb2c'

randombit/botan,webmaster128/botan,randombit/botan,webmaster128/botan,webmaster128/botan,webmaster128/botan,webmaster128/botan,Rohde-Schwarz-Cybersecurity/botan,Rohde-Schwarz-Cybersecurity/botan,Rohde-Schwarz-Cybersecurity/botan,Rohde-Schwarz-Cybersecurity/botan,randombit/botan,randombit/botan,randombit/botan,Rohde-Schwarz-Cybersecurity/botan,Rohde-Schwarz-Cybersecurity/botan