Merge branch 'botan-plugin'