Merge branch 'svn-BETA21' into bugfix2.1

diff --cc misc.c
Simple merge

diff --cc misc.h
Simple merge

diff --cc push.c
Simple merge

diff --cc ssl.c
Simple merge

diff --cc ssl.h
Simple merge

diff --cc syshead.h
Simple merge