Merge pull request #3213 from henricm/fix-for-win-securestring-to-bstr