Merge remote branch 'smgorig/master'

diff --cc libs/freetdm/src/ftdm_io.c
Simple merge

diff --cc libs/freetdm/src/ftdm_sched.c
Simple merge

diff --cc libs/freetdm/src/include/private/ftdm_types.h
Simple merge