Merge branch 'master' into gsm.merge

diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
Simple merge

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

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

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