Index: branches/2018Q1/net/asterisk13/Makefile
===================================================================
--- branches/2018Q1/net/asterisk13/Makefile	(revision 461954)
+++ branches/2018Q1/net/asterisk13/Makefile	(revision 461955)
@@ -1,297 +1,299 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	13.18.5
-PORTREVISION=	1
+PORTVERSION=	13.19.1
 CATEGORIES=	net
-MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
+MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	13
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		libjansson.so:devel/jansson
 
 ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc sparc64
 
 EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
 
 USES=		bison cpe gmake iconv libedit localbase \
 		shebangfix sqlite ssl ncurses
 USE_CSTD=	gnu89
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	asterisk
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--datarootdir=${DATADIR} \
 			--with-ilbc=internal \
 			--with-crypto=${OPENSSLBASE} \
 			--with-ssl=${OPENSSLBASE}
 
 CPE_VENDOR=	digium
 
 SHEBANG_FILES=	agi/agi-test.agi \
 		agi/jukebox.agi \
 		contrib/scripts/astversion
 
 MAKE_ENV=	PTHREAD_LIBS="-lpthread" \
 		MKDIR="${MKDIR}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OSVERSION=${OSVERSION} \
 		DOCSDIR=${DOCSDIR} \
 		ASTCFLAGS="${CFLAGS}" \
 		ASTLDFLAGS="${LDFLAGS}"
 MAKE_ARGS+=	NOISY_BUILD=yes \
 		ASTDATADIR=${DATADIR}
 
 CONFLICTS=		ossp-uuid-[0-9]*
 CONFLICTS_BUILD=	linuxthreads-*
 CONFLICTS_INSTALL=	asterisk*-1.8* asterisk*-11*
 
 OPTIONS_DEFINE=			ASTVERSION BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \
 				MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
 				SPANDSP SRTP SYSINFO XMPP
 OPTIONS_DEFAULT=		CURL FREETDS GSM LUA MP3PLAYER NEWT ODBC MYSQL PGSQL PJSIP \
 				PORTAUDIO RADIUS SNMP SPANDSP SPEEX SQLITE2 VORBIS
 
 OPTIONS_DEFINE_i386=		DAHDI
 OPTIONS_DEFINE_amd64=		DAHDI
 OPTIONS_DEFINE_sparc64=		DAHDI
 
 OPTIONS_DEFAULT_i386=		DAHDI BASE XMPP
 OPTIONS_DEFAULT_amd64=		DAHDI BASE XMPP
 OPTIONS_DEFAULT_sparc64=	DAHDI GCC XMPP
 OPTIONS_DEFAULT_powerpc=	GCC XMPP
 OPTIONS_DEFAULT_armv6=		BASE
 OPTIONS_DEFAULT_armv7=		BASE
 
 OPTIONS_GROUP=			CODECS
 OPTIONS_GROUP_CODECS=		GSM NEWG711 SPEEX VORBIS
 CODECS_DESC=			Encoder/Decoder (Codec) Support
 
 OPTIONS_SINGLE=			COMPILER
 OPTIONS_SINGLE_COMPILER=	BASE GCC
 COMPILER_DESC=			Compiler to use
 
 OPTIONS_GROUP+=			DATABASE
 OPTIONS_GROUP_DATABASE=		MYSQL ODBC PGSQL SQLITE2
 DATABASE_DESC=			Database Support
 
 OPTIONS_MULTI=			MENU
 OPTIONS_MULTI_MENU=		NCURSES NEWT
 MENU_DESC=			Menuselect Interface Backend
 NEWT_DESC=			Newt User Interface
 
 OPTIONS_GROUP+=			SOUNDS
 OPTIONS_GROUP_SOUNDS=		G729
 SOUNDS_DESC=			Core and Music-on-Hold (MoH) Sound Files
 G729_DESC=			Install G.729 format sounds
 ASTERISK_CORE_G729_SOUNDS=	asterisk-core-sounds-en-g729-1.5.tar.gz
 ASTERISK_MOH_G729_SOUNDS=	asterisk-moh-opsound-g729-2.03.tar.gz
 G729_DISTFILES=			${ASTERISK_CORE_G729_SOUNDS}:g729 \
 				${ASTERISK_MOH_G729_SOUNDS}:g729
 
 ASTVERSION_DESC?= Install astversion (requires bash)
 BACKTRACE_DESC?= Stack backtrace support via (lib)execinfo
 BASE_DESC=	Use base compiler
 DAHDI_DESC?=	DAHDI support
 EXCHANGE_DESC?=	Exchange calendar support
 MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
 NEWG711_DESC?=	New G711 Codec
 OOH323_DESC?=	ooh323 support
 PJSIP_DESC?=	Build the PJSIP based SIP channel
 SRTP_DESC?=	SecureRTP support
 SYSINFO_DESC?=	Use devel/libsysinfo to get system information
 XMPP_DESC?=	XMPP/GTALK support
 
 OPTIONS_SUB=		yes
 
 ASTVERSION_RUN_DEPENDS=		bash:shells/bash
 
 BACKTRACE_CONFIGURE_WITH=	execinfo
 
 CURL_CONFIGURE_ON=	--with-libcurl
 CURL_CONFIGURE_OFF=	--with-libcurl=no
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 DAHDI_CONFIGURE_ON=	--with-dahdi --with-openr2
 DAHDI_CONFIGURE_OFF=	--without-dahdi --without-openr2
 DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
 			libopenr2.so:misc/openr2 \
 			libtonezone.so:misc/dahdi
 
 EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS=	libneon.so:www/neon
+EXCHANGE_LIB_DEPENDS=	libneon.so:www/neon \
+			libexpat.so:textproc/expat2
+EXCHANGE_USES=		gettext-runtime
 
 FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
 FREETDS_CONFIGURE_OFF=	--without-tds
 FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
 
 GCC_USE=		GCC=yes
 
 GSM_CONFIGURE_WITH=	gsm
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 
 LUA_CONFIGURE_WITH=	lua
 LUA_USES=		lua:51
 LUA_CFLAGS=		-I${LUA_INCDIR}
 LUA_LDFLAGS=		-L${LUA_LIBDIR}
 
 MYSQL_CONFIGURE_WITH=	mysqlclient
 MYSQL_USES=		mysql
 
 MP3PLAYER_RUN_DEPENDS=	mpg123:audio/mpg123
 
 NCURSES_USES=		ncurses
 NEWT_LIB_DEPENDS=	libnewt.so:devel/newt
 
 ODBC_CONFIGURE_WITH=	unixodbc
 ODBC_CONFIGURE_ON=	--with-ltdl
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 			libltdl.so:devel/libltdl
 
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
 
 PJSIP_CONFIGURE_WITH=	pjproject
 PJSIP_USES=		pkgconfig
 PJSIP_LIB_DEPENDS=	libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
 
 PORTAUDIO_CONFIGURE_WITH=	portaudio
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 RADIUS_CONFIGURE_WITH=	radius
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 
 SNMP_CONFIGURE_WITH=	netsnmp
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp \
 			libpkg.so:ports-mgmt/pkg
 
 SPANDSP_CONFIGURE_WITH=	spandsp
 SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp \
 			libtiff.so:graphics/tiff
 
 SPEEX_CONFIGURE_WITH=	speex
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
 
 SQLITE2_CONFIGURE_WITH=	sqlite
 SQLITE2_LIB_DEPENDS=	libsqlite.so:databases/sqlite2
 
 SRTP_CONFIGURE_WITH=	srtp
+SRTP_LIB_DEPENDS=	libsrtp.so:net/libsrtp
 
 SYSINFO_LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
 
 VORBIS_CONFIGURE_WITH=	ogg
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 
 XMPP_CONFIGURE_WITH=	iksemel
 XMPP_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
 
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk
 
 USERS=	${ASTERISK_USER}
 GROUPS=	${ASTERISK_GROUP} dahdi
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP}
 LIB_DEPENDS+=	libpj.so:net/pjsip-extsrtp
 .elif ${PORT_OPTIONS:MPJSIP} && ! ${PORT_OPTIONS:MSRTP}
 LIB_DEPENDS+=   libpj.so:net/pjsip
 .elif ! ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP}
 LIB_DEPENDS+=   libsrtp.so:net/libsrtp
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if empty(ICONV_LIB)
 CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \
 		ac_cv_lib_iconv_libiconv_open=no
 .endif
 
 .if ${PREFIX} == ${LOCALBASE}
 VARDIR=/var
 .else
 VARDIR=${PREFIX}/var
 .endif
 
 SUB_LIST+=	ASTERISK_USER=${ASTERISK_USER}
 PLIST_SUB+=	ASTERISK_USER=${ASTERISK_USER} \
 		ASTERISK_GROUP=${ASTERISK_GROUP} \
 		VARDIR=${VARDIR}
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.d' -delete
 
 post-extract-G729-on:
 	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
 	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
 .if exists(${FILESDIR}/.asterisk.makeopts)
 	${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts
 .endif
 
 post-patch-SYSINFO-on:
 	@${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile
 
 post-patch-SYSINFO-off:
 	@${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
 
 post-configure:
 	@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts
 
 post-configure-MYSQL-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts
 
 post-configure-OOH323-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
 
 post-configure-NEWG711-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts
 
 post-configure-OPTIMIZED_CFLAGS-off:
 	@cd ${WRKSRC} && ./menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts
 
 post-install:
 	@${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ast[a-f]* ${STAGEDIR}${PREFIX}/lib/*.so.* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/*.so ${STAGEDIR}${DATADIR}/agi-bin/eagi-*
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
 	${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
 	${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
 
 	(cd ${STAGEDIR} && \
 		${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \
 		${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \
 		${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \
 		${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \
 		${ECHO} "@owner" >> ${TMPPLIST} && \
 		${ECHO} "@group" >> ${TMPPLIST});
 
 post-install-ASTVERSION-off:
 	@${RM} ${STAGEDIR}${PREFIX}/sbin/astversion
 
 .include <bsd.port.post.mk>
Index: branches/2018Q1/net/asterisk13/distinfo
===================================================================
--- branches/2018Q1/net/asterisk13/distinfo	(revision 461954)
+++ branches/2018Q1/net/asterisk13/distinfo	(revision 461955)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1514023097
-SHA256 (asterisk-13.18.5.tar.gz) = 23706560ae2d83af44b521040b2db1155b3e873b0e1fbcbe27ae4b7895f3b74f
-SIZE (asterisk-13.18.5.tar.gz) = 32973835
+TIMESTAMP = 1518560936
+SHA256 (asterisk-13.19.1.tar.gz) = ff64118f9b9e5b3c84d09105a24751af573976718ce4bfd641075eb01b56dc63
+SIZE (asterisk-13.19.1.tar.gz) = 32989891
 SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
 SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
 SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
Index: branches/2018Q1/net/asterisk13/files/patch-channels-chan_dahdi.c
===================================================================
--- branches/2018Q1/net/asterisk13/files/patch-channels-chan_dahdi.c	(revision 461954)
+++ branches/2018Q1/net/asterisk13/files/patch-channels-chan_dahdi.c	(revision 461955)
@@ -1,45 +1,32 @@
---- channels/chan_dahdi.c.orig	2017-10-13 17:46:56 UTC
+--- channels/chan_dahdi.c.orig	2017-12-20 19:05:45 UTC
 +++ channels/chan_dahdi.c
-@@ -61,10 +61,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
- #include <signal.h>
- #else
- #include <sys/signal.h>
-+#include <sys/sysmacros.h>
- #endif
- #include <sys/stat.h>
- #include <math.h>
--#include <sys/sysmacros.h>
- 
- #include "sig_analog.h"
- /* Analog signaling is currently still present in chan_dahdi for use with
 @@ -4666,6 +4666,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
  		return;
  	}
  	if (p->echocancel.head.tap_length) {
 +		struct dahdi_echocanparams *pecp;
 +
  #if defined(HAVE_PRI) || defined(HAVE_SS7)
  		switch (p->sig) {
  #if defined(HAVE_PRI)
-@@ -4696,7 +4698,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4696,7 +4698,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
  			break;
  		}
  #endif	/* defined(HAVE_PRI) || defined(HAVE_SS7) */
 -		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel);
-+
 +		pecp = &p->echocancel.head;
 +		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
  		if (res) {
  			ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
  		} else {
-@@ -4730,8 +4734,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
+@@ -4730,8 +4733,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
  
  	if (p->echocanon) {
  		struct dahdi_echocanparams ecp = { .tap_length = 0 };
 +		struct dahdi_echocanparams *pecp = &ecp;
  
 -		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &ecp);
 +		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
  
  		if (res)
  			ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno));
Index: branches/2018Q1/net/asterisk13/files/patch-configure
===================================================================
--- branches/2018Q1/net/asterisk13/files/patch-configure	(revision 461954)
+++ branches/2018Q1/net/asterisk13/files/patch-configure	(revision 461955)
@@ -1,110 +1,102 @@
---- configure.orig	2017-10-13 17:46:56 UTC
+--- configure.orig	2017-12-20 19:05:45 UTC
 +++ configure
-@@ -4780,9 +4780,9 @@ astheaderdir='${includedir}/asterisk'
+@@ -4782,9 +4782,9 @@ astheaderdir='${includedir}/asterisk'
  astlibdir='${libdir}'
  astmoddir='${libdir}/asterisk/modules'
  astmandir='${mandir}'
 -astvarlibdir='${localstatedir}/lib/asterisk'
 +astvarlibdir='${prefix}/share/asterisk'
  astdatadir='${astvarlibdir}'
 -astdbdir='${astvarlibdir}'
 +astdbdir='${localstatedir}/db/asterisk'
  astkeydir='${astvarlibdir}'
  astspooldir='${localstatedir}/spool/asterisk'
  astlogdir='${localstatedir}/log/asterisk'
-@@ -4805,8 +4805,6 @@ esac
+@@ -4807,8 +4807,6 @@ esac
  case "${host_os}" in
       freebsd*)
       ac_default_prefix=/usr/local
 -     CPPFLAGS=-I/usr/local/include
 -     LDFLAGS=-L/usr/local/lib
       ;;
       openbsd*)
       ac_default_prefix=/usr/local
-@@ -20706,6 +20704,8 @@ $as_echo_n "checking if \"struct ifaddrs *p; getifaddr
+@@ -20266,6 +20264,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
  
  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 + #include <sys/types.h>
 + #include <sys/socket.h>
   #include <ifaddrs.h>
  int
  main ()
-@@ -30588,13 +30588,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -29529,13 +29529,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+ 
        ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
        CFLAGS="${CFLAGS} "
-       as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.2" >&5
--$as_echo_n "checking for ${pbxfuncname} in -llua5.2... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.2" >&5
-+$as_echo_n "checking for ${pbxfuncname} in -llua-5.2... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2" >&5
+-$as_echo_n "checking for luaL_newstate in -llua5.2... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-5.2" >&5
++$as_echo_n "checking for luaL_newstate in -lluai-5.2... " >&6; }
+ if ${ac_cv_lib_lua5_2_luaL_newstate+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-llua5.2 ${pbxlibdir} -lm $LIBS"
 +LIBS="-llua-5.2 ${pbxlibdir} -lm $LIBS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -30636,18 +30636,18 @@ fi
+@@ -29576,7 +29576,7 @@ fi
  
     # now check for the header.
     if test "${AST_LUA_FOUND}" = "yes"; then
 -      LUA_LIB="${pbxlibdir} -llua5.2 -lm"
 +      LUA_LIB="${pbxlibdir} -llua-5.2 -lm"
        # if --with-LUA=DIR has been specified, use it.
        if test "x${LUA_DIR}" != "x"; then
           LUA_INCLUDE="-I${LUA_DIR}/include"
-       fi
-       LUA_INCLUDE="${LUA_INCLUDE} "
--      if test "xlua5.2/lua.h" = "x" ; then	# no header, assume found
-+      if test "xlua52/lua.h" = "x" ; then	# no header, assume found
-          LUA_HEADER_FOUND="1"
-       else				# check for the header
+@@ -29586,7 +29586,7 @@ fi
+          # check for the header
           ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
           CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
 -         ac_fn_c_check_header_mongrel "$LINENO" "lua5.2/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"
 +         ac_fn_c_check_header_mongrel "$LINENO" "lua52/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"
  if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :
    LUA_HEADER_FOUND=1
  else
-@@ -30700,13 +30700,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -29633,13 +29633,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+ 
        ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
        CFLAGS="${CFLAGS} "
-       as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5
--$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.1" >&5
-+$as_echo_n "checking for ${pbxfuncname} in -llua-5.1... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1" >&5
+-$as_echo_n "checking for luaL_newstate in -llua5.1... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-5.1" >&5
++$as_echo_n "checking for luaL_newstate in -llua-5.1... " >&6; }
+ if ${ac_cv_lib_lua5_1_luaL_newstate+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS"
 +LIBS="-llua-5.1 ${pbxlibdir} -lm $LIBS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -30748,18 +30748,18 @@ fi
+@@ -29680,7 +29680,7 @@ fi
  
     # now check for the header.
     if test "${AST_LUA_FOUND}" = "yes"; then
 -      LUA_LIB="${pbxlibdir} -llua5.1 -lm"
 +      LUA_LIB="${pbxlibdir} -llua-5.1 -lm"
        # if --with-LUA=DIR has been specified, use it.
        if test "x${LUA_DIR}" != "x"; then
           LUA_INCLUDE="-I${LUA_DIR}/include"
-       fi
-       LUA_INCLUDE="${LUA_INCLUDE} "
--      if test "xlua5.1/lua.h" = "x" ; then	# no header, assume found
-+      if test "xlua51/lua.h" = "x" ; then	# no header, assume found
-          LUA_HEADER_FOUND="1"
-       else				# check for the header
+@@ -29690,7 +29690,7 @@ fi
+          # check for the header
           ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
           CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
 -         ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
 +         ac_fn_c_check_header_mongrel "$LINENO" "lua51/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
  if test "x$ac_cv_header_lua5_1_lua_h" = xyes; then :
    LUA_HEADER_FOUND=1
  else
Index: branches/2018Q1/net/asterisk13/pkg-descr
===================================================================
--- branches/2018Q1/net/asterisk13/pkg-descr	(revision 461954)
+++ branches/2018Q1/net/asterisk13/pkg-descr	(revision 461955)
@@ -1,5 +1,5 @@
 Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
 sense, middleware between Internet and telephony channels on the bottom,
 and Internet and telephony applications at the top.
 
-WWW: http://www.asterisk.org
+WWW: https://www.asterisk.org
Index: branches/2018Q1/net/asterisk13/pkg-plist
===================================================================
--- branches/2018Q1/net/asterisk13/pkg-plist	(revision 461954)
+++ branches/2018Q1/net/asterisk13/pkg-plist	(revision 461955)
@@ -1,402 +1,398 @@
 @sample %%ETCDIR%%/acl.conf.sample
 @sample %%ETCDIR%%/adsi.conf.sample
 @sample %%ETCDIR%%/agents.conf.sample
 @sample %%ETCDIR%%/alarmreceiver.conf.sample
 @sample %%ETCDIR%%/alsa.conf.sample
 @sample %%ETCDIR%%/amd.conf.sample
 @sample %%ETCDIR%%/app_mysql.conf.sample
 @sample %%ETCDIR%%/app_skel.conf.sample
 @sample %%ETCDIR%%/ari.conf.sample
 @sample %%ETCDIR%%/ast_debug_tools.conf.sample
 @sample %%ETCDIR%%/asterisk.adsi.sample
 @sample %%ETCDIR%%/asterisk.conf.sample
 @sample %%ETCDIR%%/calendar.conf.sample
 @sample %%ETCDIR%%/ccss.conf.sample
 @sample %%ETCDIR%%/cdr.conf.sample
 @sample %%ETCDIR%%/cdr_adaptive_odbc.conf.sample
 @sample %%ETCDIR%%/cdr_custom.conf.sample
 @sample %%ETCDIR%%/cdr_manager.conf.sample
 @sample %%ETCDIR%%/cdr_mysql.conf.sample
 @sample %%ETCDIR%%/cdr_odbc.conf.sample
 @sample %%ETCDIR%%/cdr_pgsql.conf.sample
 @sample %%ETCDIR%%/cdr_sqlite3_custom.conf.sample
 @sample %%ETCDIR%%/cdr_syslog.conf.sample
 @sample %%ETCDIR%%/cdr_tds.conf.sample
 @sample %%ETCDIR%%/cel.conf.sample
 @sample %%ETCDIR%%/cel_custom.conf.sample
 @sample %%ETCDIR%%/cel_odbc.conf.sample
 @sample %%ETCDIR%%/cel_pgsql.conf.sample
 @sample %%ETCDIR%%/cel_sqlite3_custom.conf.sample
 @sample %%ETCDIR%%/cel_tds.conf.sample
 @sample %%ETCDIR%%/chan_dahdi.conf.sample
 @sample %%ETCDIR%%/chan_mobile.conf.sample
 @sample %%ETCDIR%%/cli.conf.sample
 @sample %%ETCDIR%%/cli_aliases.conf.sample
 @sample %%ETCDIR%%/cli_permissions.conf.sample
 @sample %%ETCDIR%%/codecs.conf.sample
 @sample %%ETCDIR%%/confbridge.conf.sample
 @sample %%ETCDIR%%/config_test.conf.sample
 @sample %%ETCDIR%%/console.conf.sample
 @sample %%ETCDIR%%/dbsep.conf.sample
 @sample %%ETCDIR%%/dnsmgr.conf.sample
 @sample %%ETCDIR%%/dsp.conf.sample
 @sample %%ETCDIR%%/dundi.conf.sample
 @sample %%ETCDIR%%/enum.conf.sample
 @sample %%ETCDIR%%/extconfig.conf.sample
 @sample %%ETCDIR%%/extensions.ael.sample
 @sample %%ETCDIR%%/extensions.conf.sample
 @sample %%ETCDIR%%/extensions.lua.sample
 @sample %%ETCDIR%%/extensions_minivm.conf.sample
 @sample %%ETCDIR%%/features.conf.sample
 @sample %%ETCDIR%%/festival.conf.sample
 @sample %%ETCDIR%%/followme.conf.sample
 @sample %%ETCDIR%%/func_odbc.conf.sample
 @sample %%ETCDIR%%/hep.conf.sample
 @sample %%ETCDIR%%/http.conf.sample
 @sample %%ETCDIR%%/iax.conf.sample
 @sample %%ETCDIR%%/iaxprov.conf.sample
 @sample %%ETCDIR%%/indications.conf.sample
 @sample %%ETCDIR%%/logger.conf.sample
 @sample %%ETCDIR%%/manager.conf.sample
 @sample %%ETCDIR%%/meetme.conf.sample
 @sample %%ETCDIR%%/mgcp.conf.sample
 @sample %%ETCDIR%%/minivm.conf.sample
 @sample %%ETCDIR%%/misdn.conf.sample
 @sample %%ETCDIR%%/modules.conf.sample
 @sample %%ETCDIR%%/motif.conf.sample
 @sample %%ETCDIR%%/musiconhold.conf.sample
 @sample %%ETCDIR%%/muted.conf.sample
 @sample %%ETCDIR%%/ooh323.conf.sample
 @sample %%ETCDIR%%/osp.conf.sample
 @sample %%ETCDIR%%/oss.conf.sample
 @sample %%ETCDIR%%/phone.conf.sample
 @sample %%ETCDIR%%/phoneprov.conf.sample
 @sample %%ETCDIR%%/pjproject.conf.sample
 @sample %%ETCDIR%%/pjsip.conf.sample
 @sample %%ETCDIR%%/pjsip_notify.conf.sample
 @sample %%ETCDIR%%/pjsip_wizard.conf.sample
 @sample %%ETCDIR%%/queuerules.conf.sample
 @sample %%ETCDIR%%/queues.conf.sample
 @sample %%ETCDIR%%/res_config_mysql.conf.sample
 @sample %%ETCDIR%%/res_config_sqlite.conf.sample
 @sample %%ETCDIR%%/res_config_sqlite3.conf.sample
 @sample %%ETCDIR%%/res_corosync.conf.sample
 @sample %%ETCDIR%%/res_curl.conf.sample
 @sample %%ETCDIR%%/res_fax.conf.sample
 @sample %%ETCDIR%%/res_ldap.conf.sample
 @sample %%ETCDIR%%/res_odbc.conf.sample
 @sample %%ETCDIR%%/res_parking.conf.sample
 @sample %%ETCDIR%%/res_pgsql.conf.sample
 @sample %%ETCDIR%%/res_pktccops.conf.sample
 @sample %%ETCDIR%%/res_snmp.conf.sample
 @sample %%ETCDIR%%/res_stun_monitor.conf.sample
 @sample %%ETCDIR%%/rtp.conf.sample
 @sample %%ETCDIR%%/say.conf.sample
 @sample %%ETCDIR%%/sip.conf.sample
 @sample %%ETCDIR%%/sip_notify.conf.sample
 @sample %%ETCDIR%%/skinny.conf.sample
 @sample %%ETCDIR%%/sla.conf.sample
 @sample %%ETCDIR%%/smdi.conf.sample
 @sample %%ETCDIR%%/sorcery.conf.sample
 @sample %%ETCDIR%%/ss7.timers.sample
 @sample %%ETCDIR%%/stasis.conf.sample
 @sample %%ETCDIR%%/statsd.conf.sample
 @sample %%ETCDIR%%/telcordia-1.adsi.sample
 @sample %%ETCDIR%%/test_sorcery.conf.sample
 @sample %%ETCDIR%%/udptl.conf.sample
 @sample %%ETCDIR%%/unistim.conf.sample
 @sample %%ETCDIR%%/users.conf.sample
 @sample %%ETCDIR%%/voicemail.conf.sample
 @sample %%ETCDIR%%/vpb.conf.sample
 @sample %%ETCDIR%%/xmpp.conf.sample
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/ael_structs.h
 include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/alertpipe.h
 include/asterisk/aoc.h
 include/asterisk/app.h
 include/asterisk/ari.h
 include/asterisk/ast_expr.h
 include/asterisk/ast_version.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
 include/asterisk/astobj.h
 include/asterisk/astobj2.h
 include/asterisk/astosp.h
 include/asterisk/audiohook.h
 include/asterisk/autochan.h
 include/asterisk/autoconfig.h
 include/asterisk/backtrace.h
 include/asterisk/beep.h
 include/asterisk/bridge.h
 include/asterisk/bridge_after.h
 include/asterisk/bridge_basic.h
 include/asterisk/bridge_channel.h
 include/asterisk/bridge_channel_internal.h
 include/asterisk/bridge_features.h
 include/asterisk/bridge_internal.h
 include/asterisk/bridge_roles.h
 include/asterisk/bridge_technology.h
 include/asterisk/bucket.h
 include/asterisk/build.h
 include/asterisk/buildinfo.h
 include/asterisk/buildopts.h
 include/asterisk/calendar.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/ccss.h
 include/asterisk/cdr.h
 include/asterisk/cel.h
 include/asterisk/celt.h
 include/asterisk/channel.h
 include/asterisk/channel_internal.h
 include/asterisk/channelstate.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
 include/asterisk/codec.h
 include/asterisk/compat.h
 include/asterisk/compiler.h
 include/asterisk/config.h
 include/asterisk/config_options.h
 include/asterisk/core_local.h
 include/asterisk/core_unreal.h
 include/asterisk/crypto.h
 include/asterisk/data.h
 include/asterisk/datastore.h
 include/asterisk/devicestate.h
 include/asterisk/dial.h
 include/asterisk/dlinkedlists.h
 include/asterisk/dns.h
 include/asterisk/dnsmgr.h
 include/asterisk/doxygen/architecture.h
-include/asterisk/doxygen/asterisk-git-howto.h
-include/asterisk/doxygen/commits.h
 include/asterisk/doxygen/licensing.h
-include/asterisk/doxygen/releases.h
-include/asterisk/doxygen/reviewboard.h
 include/asterisk/doxyref.h
 include/asterisk/dsp.h
 include/asterisk/dundi.h
 include/asterisk/endian.h
 include/asterisk/endpoints.h
 include/asterisk/enum.h
 include/asterisk/event.h
 include/asterisk/event_defs.h
 include/asterisk/extconf.h
 include/asterisk/features.h
 include/asterisk/features_config.h
 include/asterisk/file.h
 include/asterisk/format.h
 include/asterisk/format_cache.h
 include/asterisk/format_cap.h
 include/asterisk/format_compatibility.h
 include/asterisk/frame.h
 include/asterisk/framehook.h
 include/asterisk/fskmodem.h
 include/asterisk/fskmodem_float.h
 include/asterisk/fskmodem_int.h
 include/asterisk/global_datastores.h
 include/asterisk/hashtab.h
 include/asterisk/heap.h
 include/asterisk/http.h
 include/asterisk/http_websocket.h
 include/asterisk/image.h
 include/asterisk/indications.h
 include/asterisk/inline_api.h
 include/asterisk/io.h
 include/asterisk/json.h
 include/asterisk/linkedlists.h
 include/asterisk/localtime.h
 include/asterisk/lock.h
 include/asterisk/logger.h
 include/asterisk/manager.h
 include/asterisk/max_forwards.h
 include/asterisk/md5.h
 include/asterisk/media_index.h
 include/asterisk/message.h
 include/asterisk/mixmonitor.h
 include/asterisk/mod_format.h
 include/asterisk/module.h
 include/asterisk/monitor.h
 include/asterisk/multicast_rtp.h
 include/asterisk/musiconhold.h
 include/asterisk/named_locks.h
 include/asterisk/netsock.h
 include/asterisk/netsock2.h
 include/asterisk/network.h
 include/asterisk/optional_api.h
 include/asterisk/options.h
 include/asterisk/opus.h
 include/asterisk/parking.h
 include/asterisk/paths.h
 include/asterisk/pbx.h
 include/asterisk/phoneprov.h
 include/asterisk/pickup.h
 include/asterisk/pktccops.h
 include/asterisk/plc.h
 include/asterisk/poll-compat.h
 include/asterisk/presencestate.h
 include/asterisk/privacy.h
 include/asterisk/pval.h
 include/asterisk/res_fax.h
 include/asterisk/res_hep.h
 include/asterisk/res_mwi_external.h
 include/asterisk/res_odbc.h
 include/asterisk/res_odbc_transaction.h
 include/asterisk/res_pjproject.h
 include/asterisk/res_pjsip.h
 include/asterisk/res_pjsip_body_generator_types.h
 include/asterisk/res_pjsip_cli.h
 include/asterisk/res_pjsip_outbound_publish.h
 include/asterisk/res_pjsip_presence_xml.h
 include/asterisk/res_pjsip_pubsub.h
 include/asterisk/res_pjsip_session.h
 include/asterisk/res_srtp.h
 include/asterisk/rtp_engine.h
 include/asterisk/say.h
 include/asterisk/sched.h
 include/asterisk/sdp_srtp.h
 include/asterisk/security_events.h
 include/asterisk/security_events_defs.h
 include/asterisk/select.h
 include/asterisk/sem.h
 include/asterisk/sha1.h
 include/asterisk/silk.h
 include/asterisk/sip_api.h
 include/asterisk/slin.h
 include/asterisk/slinfactory.h
 include/asterisk/smdi.h
 include/asterisk/smoother.h
 include/asterisk/sorcery.h
 include/asterisk/sounds_index.h
 include/asterisk/speech.h
 include/asterisk/spinlock.h
 include/asterisk/srv.h
 include/asterisk/stasis.h
 include/asterisk/stasis_app.h
 include/asterisk/stasis_app_device_state.h
 include/asterisk/stasis_app_impl.h
 include/asterisk/stasis_app_mailbox.h
 include/asterisk/stasis_app_playback.h
 include/asterisk/stasis_app_recording.h
 include/asterisk/stasis_app_snoop.h
 include/asterisk/stasis_bridges.h
 include/asterisk/stasis_cache_pattern.h
 include/asterisk/stasis_channels.h
 include/asterisk/stasis_endpoints.h
 include/asterisk/stasis_internal.h
 include/asterisk/stasis_message_router.h
 include/asterisk/stasis_system.h
 include/asterisk/stasis_test.h
 include/asterisk/statsd.h
 include/asterisk/stringfields.h
 include/asterisk/strings.h
 include/asterisk/stun.h
 include/asterisk/syslog.h
 include/asterisk/taskprocessor.h
 include/asterisk/tcptls.h
 include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/test.h
 include/asterisk/threadpool.h
 include/asterisk/threadstorage.h
 include/asterisk/time.h
 include/asterisk/timing.h
 include/asterisk/transcap.h
 include/asterisk/translate.h
 include/asterisk/udptl.h
 include/asterisk/ulaw.h
 include/asterisk/unaligned.h
 include/asterisk/uri.h
 include/asterisk/utils.h
 include/asterisk/uuid.h
 include/asterisk/vector.h
 include/asterisk/version.h
 include/asterisk/xml.h
 include/asterisk/xmldoc.h
 include/asterisk/xmpp.h
 lib/libasteriskssl.so
 lib/libasteriskssl.so.1
 man/man8/astdb2bdb.8.gz
 man/man8/astdb2sqlite3.8.gz
 man/man8/asterisk.8.gz
 man/man8/astgenkey.8.gz
 man/man8/autosupport.8.gz
 man/man8/safe_asterisk.8.gz
 sbin/astcanary
 sbin/astdb2bdb
 sbin/astdb2sqlite3
 sbin/asterisk
 sbin/astgenkey
 %%ASTVERSION%%sbin/astversion
 sbin/autosupport
 sbin/rasterisk
 sbin/safe_asterisk
 %%DATADIR%%/agi-bin/agi-test.agi
 %%DATADIR%%/agi-bin/eagi-sphinx-test
 %%DATADIR%%/agi-bin/eagi-test
 %%DATADIR%%/agi-bin/jukebox.agi
 %%DATADIR%%/documentation/appdocsxml.dtd
 %%DATADIR%%/documentation/appdocsxml.xslt
 %%DATADIR%%/documentation/core-en_US.xml
 %%DATADIR%%/phoneprov/000000000000-directory.xml
 %%DATADIR%%/phoneprov/000000000000-phone.cfg
 %%DATADIR%%/phoneprov/000000000000.cfg
 %%DATADIR%%/phoneprov/polycom.xml
 %%DATADIR%%/phoneprov/polycom_line.xml
 %%DATADIR%%/phoneprov/snom-mac.xml
 %%DATADIR%%/rest-api/applications.json
 %%DATADIR%%/rest-api/asterisk.json
 %%DATADIR%%/rest-api/bridges.json
 %%DATADIR%%/rest-api/channels.json
 %%DATADIR%%/rest-api/deviceStates.json
 %%DATADIR%%/rest-api/endpoints.json
 %%DATADIR%%/rest-api/events.json
 %%DATADIR%%/rest-api/mailboxes.json
 %%DATADIR%%/rest-api/playbacks.json
 %%DATADIR%%/rest-api/recordings.json
 %%DATADIR%%/rest-api/resources.json
 %%DATADIR%%/rest-api/sounds.json
 %%DATADIR%%/scripts/ast_coredumper
 %%DATADIR%%/scripts/ast_logescalator
 %%DATADIR%%/scripts/ast_loggrabber
 %%DATADIR%%/static-http/appdocsxml.xslt
 %%DATADIR%%/static-http/ajamdemo.html
 %%DATADIR%%/static-http/astman.css
 %%DATADIR%%/static-http/astman.js
 %%DATADIR%%/static-http/core-en_US.xml
 %%DATADIR%%/static-http/prototype.js
 %%DATADIR%%/static-http/mantest.html
 %%DOCSDIR%%/images/asterisk-intro.jpg
 %%DOCSDIR%%/images/kpad2.jpg
 @dir lib/asterisk/modules
 @dir %%DATADIR%%/documentation/thirdparty
 @dir %%DATADIR%%/firmware/iax
 @dir %%DATADIR%%/images
 @dir %%DATADIR%%/keys
 @dir %%DATADIR%%/moh
 @dir %%DATADIR%%/sounds
 @dir %%DATADIR%%/third-party
 @owner %%ASTERISK_USER%%
 @group %%ASTERISK_GROUP%%
 @dir %%VARDIR%%/log/asterisk/cdr-csv
 @dir %%VARDIR%%/log/asterisk/cdr-custom
 @dir %%VARDIR%%/log/asterisk/cel-custom
 @dir %%VARDIR%%/log/asterisk
 @dir %%VARDIR%%/spool/asterisk/dictate
 @dir %%VARDIR%%/spool/asterisk/meetme
 @dir %%VARDIR%%/spool/asterisk/monitor
 @dir %%VARDIR%%/spool/asterisk/outgoing
 @dir %%VARDIR%%/spool/asterisk/recording
 @dir %%VARDIR%%/spool/asterisk
 @dir %%VARDIR%%/spool/asterisk/system
 @dir %%VARDIR%%/spool/asterisk/tmp
 @dir %%VARDIR%%/db/asterisk
 @dir %%VARDIR%%/run/asterisk
 @owner
 @group
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 461954)
+++ branches/2018Q1	(revision 461955)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r458800,461819