merge of '022cd3c92c37dee696d0c3c0c197f8df8981ccbb'      and '83151ac7a83013a2874f78978df5c4739b879775'
merge of '022cd3c92c37dee696d0c3c0c197f8df8981ccbb'
     and '83151ac7a83013a2874f78978df5c4739b879775'

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