ssh/session-type.h, ssh/session-type.c: Cleanup
Merge branch 'master' into gc-bug-fix