Merge pull request #2703 from akallabeth/unified_sspi