Merge remote-tracking branch 'moystash/em-suspend-support'

Conflicts:
	libs/freetdm/src/include/private/ftdm_core.h

diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
index 846f9cb7899d29ca9cbfa39be3b55e295d9e8128,e9fbba34d42d81c86917b7a0eed9cb47fe877ab7..e8468c0394af7ad9a5ee26b9978935ff54cbec68
mode 100644,100755..100644
--- 1/libs/freetdm/mod_freetdm/mod_freetdm.c
--- 2/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c

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

diff --cc libs/freetdm/src/ftmod/ftmod_analog/ftdm_analog.h
Simple merge

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

diff --cc libs/freetdm/src/include/private/ftdm_core.h
index f4a1fe4e293bf4dc45a2266b8d5be0e5c860be0a,15d8ff248ba985863c631c35a31ef7d1dae883a4..609198e731d18b54ae4cf8a3981e2da0a6c1fb91
--- 1/libs/freetdm/src/include/private/ftdm_core.h
--- 2/libs/freetdm/src/include/private/ftdm_core.h
+++ b/libs/freetdm/src/include/private/ftdm_core.h
@@@ -513,8 -514,8 +514,9 @@@ struct ftdm_span 
        ftdm_span_stop_t stop;
        ftdm_channel_sig_read_t sig_read;
        ftdm_channel_sig_write_t sig_write;
 -      ftdm_channel_sig_dtmf_t sig_dtmf;
 +      ftdm_channel_sig_dtmf_t sig_queue_dtmf;
 +      ftdm_channel_sig_dtmf_t sig_send_dtmf;
+       uint32_t sig_release_guard_time_ms;
        ftdm_channel_state_processor_t state_processor; /*!< This guy is called whenever state processing is required */
        void *io_data; /*!< Private I/O data per span. Do not touch unless you are an I/O module */
        char *type;