Add Kerberos fix which was in 0.9.8-stable but never committed to HEAD and