Merge branch 'master' into bugfix2.1

diff --cc forward.c
Simple merge

diff --cc init.c
Simple merge

diff --cc misc.c
Simple merge

diff --cc misc.h
Simple merge

diff --cc multi.c
Simple merge

diff --cc options.c
Simple merge

diff --cc ssl.c
Simple merge

diff --cc ssl.h
Simple merge

diff --cc syshead.h
Simple merge