merging kerberos pull req. by @arwarw via github