Merge branch 'master' of git@git.freeswitch.org:freeswitch

Conflicts:

	src/mod/applications/mod_conference/mod_conference.c

diff --cc src/mod/applications/mod_conference/mod_conference.c
index c6a409e7bab94be1364b4cd13a58c92e74be6c48,fef64d50fced68a947aca876c0a0b7cfdb10f4c4..bdf565952e5cab1921a86cdfc13e3f4fae97ea14
--- 1/src/mod/applications/mod_conference/mod_conference.c
--- 2/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@@ -5993,8 -5984,10 +5992,12 @@@ static conference_obj_t *conference_new
        char *verbose_events = NULL;
        char *auto_record = NULL;
        char *terminate_on_silence = NULL;
 +      char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1];
 +      switch_uuid_t uuid;
+       switch_codec_implementation_t read_impl = { 0 };
+       switch_channel_t *channel = NULL;
+       const char *force_rate = NULL, *force_interval = NULL;
+       uint32_t force_rate_i = 0, force_interval_i = 0;
  
        /* Validate the conference name */
        if (zstr(name)) {