Merge pull request #1792 from MikePetullo/krb5