Merge pull request #2777 from blogic/krb5