Merge branch 'master' into v1.10

diff --cc build/next-release.txt
index 145fe2dd008663195243d15a858a7c753e6cb259,3bf213d773a665923a75f93e801817ae081a43d3..1c795d02d1946e900cc1e678d8cecc0dbd4657ca
--- 1/build/next-release.txt
--- 2/build/next-release.txt
+++ b/build/next-release.txt
@@@ -1,1 -1,1 +1,1 @@@
- 1.10.3-release
 -1.10.4-dev
++1.10.4-release

diff --cc configure.ac
index c5f10ef2adfcdbc72947c864cb61342e207dde4f,03058582ad08eb3c0bc8604db6b54d37c7e220f6..8a5e154ed9781a06253f85fe55e294af3c447cbb
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3,10 -3,10 +3,10 @@@
  
  # Must change all of the below together
  # For a release, set revision for that tagged release as well and uncomment
- AC_INIT([freeswitch], [1.10.3-release], bugs@freeswitch.org)
 -AC_INIT([freeswitch], [1.10.4-dev], bugs@freeswitch.org)
++AC_INIT([freeswitch], [1.10.4-release], bugs@freeswitch.org)
  AC_SUBST(SWITCH_VERSION_MAJOR, [1])
  AC_SUBST(SWITCH_VERSION_MINOR, [10])
- AC_SUBST(SWITCH_VERSION_MICRO, [3-release])
 -AC_SUBST(SWITCH_VERSION_MICRO, [4-dev])
++AC_SUBST(SWITCH_VERSION_MICRO, [4-release])
  AC_SUBST(SWITCH_VERSION_REVISION, [])
  AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])