diff --git a/CHANGES b/CHANGES
index 2db0368f0e..7fae4dc943 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+2.5-922 | 2018-08-29 17:22:20 -0500
+
+  * Fix unit tests (Jon Siwek, Corelight)
+
+  * Fix strict-aliasing compiler warning (Jon Siwek, Corelight)
+
 2.5-919 | 2018-08-29 14:58:06 -0500
 
   * Update unit test baseline for new BinPAC output (Jon Siwek, Corelight)
diff --git a/VERSION b/VERSION
index ff0fdea717..86e9b1b108 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-919
+2.5-922
diff --git a/aux/broker b/aux/broker
index 18d56b7055..dede39c133 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit 18d56b70558db61f424dc90e5d010f57b75de459
+Subproject commit dede39c13390bcd57dff311dab9648db7dfdaa89
diff --git a/src/3rdparty b/src/3rdparty
index 7c95b51de2..d7af30b30c 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 7c95b51de202ac534b27dd721da5778b773dd614
+Subproject commit d7af30b30c811077d3838f4142400d8cc1f2cdbb
diff --git a/testing/btest/scripts/base/frameworks/config/updates.bro b/testing/btest/scripts/base/frameworks/config/updates.bro
index a4ee557e27..5a2e051817 100644
--- a/testing/btest/scripts/base/frameworks/config/updates.bro
+++ b/testing/btest/scripts/base/frameworks/config/updates.bro
@@ -1,13 +1,10 @@
 # @TEST-EXEC: btest-bg-run bro bro -b %INPUT
 # @TEST-EXEC: $SCRIPTS/wait-for-file bro/got1 10 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv configfile2 configfile
-# @TEST-EXEC: touch configfile
 # @TEST-EXEC: $SCRIPTS/wait-for-file bro/got2 10 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv configfile3 configfile
-# @TEST-EXEC: touch configfile
 # @TEST-EXEC: $SCRIPTS/wait-for-file bro/got3 10 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv configfile4 configfile
-# @TEST-EXEC: touch configfile
 # @TEST-EXEC: btest-bg-wait 10
 # @TEST-EXEC: btest-diff bro/config.log