GH-64: Eric Mason's patch, whitespace cleaned up
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config.c
	putty.h
	terminal.c