Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch

diff --cc src/mod/endpoints/mod_sofia/sofia.c
Simple merge

diff --cc src/mod/endpoints/mod_sofia/sofia_glue.c
index 49079f106daa479ae2ced1ea510d214dbac79fbd,f20f1a1e8c17754f643424474d4321d42ddc2090..0aafd19789fd55f2fb1eb02ab4a2762661dd5d2a
--- 1/src/mod/endpoints/mod_sofia/sofia_glue.c
--- 2/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@@ -1233,12 -1233,8 +1233,12 @@@ switch_status_t sofia_glue_do_invite(sw
                                          switch_channel_get_name(tech_pvt->channel), switch_version_full_human(), 
                                          tech_pvt->mparams.local_sdp_str ? tech_pvt->mparams.local_sdp_str : "NO SDP PRESENT\n");
  
-       tech_pvt->sent_invites++;
+ 
  
 +      if (switch_channel_get_private(tech_pvt->channel, "t38_options")) {
 +              sofia_clear_flag(tech_pvt, TFLAG_ENABLE_SOA);
 +      }
 +
        if (sofia_use_soa(tech_pvt)) {
                nua_invite(tech_pvt->nh,
                                   NUTAG_AUTOANSWER(0),