Resync nzmqt with upstream.  Fixes #10924.