merged mainline tedious with ntlm experimental
Merge branch 'pekim-master'