Merge remote-tracking branch 'original/master'

Conflicts:
	httpntlm.js