Merge pull request #2561 from MikePetullo/krb5