diff --git a/UPGRADE-1.6.txt b/UPGRADE-1.6.txt
index c6ed5404b..9d09ab002 100644
--- a/UPGRADE-1.6.txt
+++ b/UPGRADE-1.6.txt
@@ -71,6 +71,12 @@ Core:
   You now only need to quote strings in configuration files if you literally
   want quotation marks within a string.
 
+* Any applications run that contain the pipe symbol but not a comma symbol will
+  get a warning printed to the effect that the application delimiter has changed.
+  However, there are legitimate reasons why this might be useful in certain
+  situations, so this warning can be turned off with the dontwarn option in
+  asterisk.conf.
+
 * The logger.conf option 'rotatetimestamp' has been deprecated in favor of
   'rotatestrategy'.  This new option supports a 'rotate' strategy that more
   closely mimics the system logger in terms of file rotation.
diff --git a/main/pbx.c b/main/pbx.c
index 9aa3b31db..d8b7ff33c 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -1361,7 +1361,7 @@ int pbx_exec(struct ast_channel *c,	/*!< Channel */
 	if (app->module)
 		u = __ast_module_user_add(app->module, c);
 	if (strcasecmp(app->name, "system") && !ast_strlen_zero(data) &&
-			strchr(data, '|') && !strchr(data, ',')) {
+			strchr(data, '|') && !strchr(data, ',') && !ast_opt_dont_warn) {
 		ast_log(LOG_WARNING, "The application delimiter is now the comma, not "
 			"the pipe.  Did you forget to convert your dialplan?  (%s(%s))\n",
 			app->name, (char *) data);