Ignore NTLM handshake unless NTLM is configured
Merge remote-tracking branch 'origin/master' into devel