Merge pull request #4233 from akallabeth/kerberos_rebased
authorDavid Fort <rdp.effort@gmail.com>
Mon, 13 Nov 2017 16:39:27 +0000 (17:39 +0100)
committerGitHub <noreply@github.com>
Mon, 13 Nov 2017 16:39:27 +0000 (17:39 +0100)
Kerberos rebased


Trivial merge