Merge branch 'master' into smgmaster

Conflicts:
	src/switch_console.c

diff --cc libs/esl/fs_cli.c
Simple merge

diff --cc src/mod/applications/mod_commands/mod_commands.c
Simple merge

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

diff --cc src/switch.c
Simple merge

diff --cc src/switch_console.c
index 5e79f14503304b612e96434d07f260b769068eef,d902af69e71675da63abc82d0ea583f7032f1f88..1e6430018ee8111eb5eaee08d243d7e4705322bb
--- 1/src/switch_console.c
--- 2/src/switch_console.c
+++ b/src/switch_console.c
@@@ -1001,7 -998,7 +998,7 @@@ static unsigned char console_f12key(Edi
  char *prompt(EditLine * e)
  {
        if (*prompt_str == '\0') {
-               switch_snprintf(prompt_str, sizeof(prompt_str), "sangoma-media-gateway@%s> ", hostname);
 -              switch_snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", switch_core_get_switchname());
++              switch_snprintf(prompt_str, sizeof(prompt_str), "sangoma-media-gateway@%s> ", switch_core_get_switchname());
        }
  
        return prompt_str;

diff --cc src/switch_core.c
index 07aca5752ee802e9bce7dbfbbf11b95a9b9838cb,b0c983cab515375975c57ba0dd9ad790641d850d..c6c55d48c61b427f04661fff3ae88c3c1756c2d2
--- 1/src/switch_core.c
--- 2/src/switch_core.c
+++ b/src/switch_core.c
@@@ -483,11 -519,11 +519,14 @@@ SWITCH_DECLARE(void) switch_core_set_gl
        GetModuleFileName(NULL, base_dir, BUFSIZE);
        lastbacklash = strrchr(base_dir, '\\');
        base_dir[(lastbacklash - base_dir)] = '\0';
+       /* set base_dir as cwd, to be able to use relative paths in scripting languages (e.g. mod_lua) when FS is running as a service or while debugging FS using visual studio */
+       SetCurrentDirectory(base_dir);
+ 
  #else
        char base_dir[1024] = SWITCH_PREFIX_DIR;
 +      if (SWITCH_GLOBAL_dirs.base_dir) {
 +              snprintf(base_dir, sizeof(base_dir), "%s", SWITCH_GLOBAL_dirs.base_dir);
 +      }
  #endif
  
        if (!SWITCH_GLOBAL_dirs.base_dir && (SWITCH_GLOBAL_dirs.base_dir = (char *) malloc(BUFSIZE))) {

diff --cc src/switch_loadable_module.c
Simple merge