Merge branch 'master' into v1.10

diff --cc build/next-release.txt
index 1c795d02d1946e900cc1e678d8cecc0dbd4657ca,3e5a73e8a45f5134acaedfeb6631357f22610199..2b93e01043e4d74f95f540b4fde878f71a4002e9
--- 1/build/next-release.txt
--- 2/build/next-release.txt
+++ b/build/next-release.txt
@@@ -1,1 -1,1 +1,1 @@@
- 1.10.4-release
 -1.10.5-dev
++1.10.5-release

diff --cc configure.ac
index 8a5e154ed9781a06253f85fe55e294af3c447cbb,169e899807a7bc18dd8998fbe45e7c43a0dbac8f..2f9de1dee9650f7b21a093c5b571db0a97851fa4
--- 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.4-release], bugs@freeswitch.org)
 -AC_INIT([freeswitch], [1.10.5-dev], bugs@freeswitch.org)
++AC_INIT([freeswitch], [1.10.5-release], bugs@freeswitch.org)
  AC_SUBST(SWITCH_VERSION_MAJOR, [1])
  AC_SUBST(SWITCH_VERSION_MINOR, [10])
- AC_SUBST(SWITCH_VERSION_MICRO, [4-release])
 -AC_SUBST(SWITCH_VERSION_MICRO, [5-dev])
++AC_SUBST(SWITCH_VERSION_MICRO, [5-release])
  AC_SUBST(SWITCH_VERSION_REVISION, [])
  AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])