diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 2af81d487c..a940523edf 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -3,9 +3,6 @@ name: Generate Documentation
 on:
   schedule:
     - cron: '0 0 * * *'
-  push:
-    branches:
-      - topic/timw/send-email-on-docs-action-failure
 
 jobs:
   generate:
@@ -95,3 +92,16 @@ jobs:
           git add doc
           git status
           git commit -m 'Update doc submodule [nomail] [skip ci]' && git push auth master || /bin/true
+
+      - name: Send email
+        if: failure()
+        uses: dawidd6/action-send-mail@v3.4.1
+        with:
+          server_address: ${{secrets.SMTP_HOST}}
+          server_port: ${{secrets.SMTP_PORT}}
+          username: ${{secrets.SMTP_USER}}
+          password: ${{secrets.SMTP_PASS}}
+          subject: generate-docs Github Action failed!
+          body: generate-docs job of ${{github.repository}} Failed! See https://github.com/${{github.repository}}/actions/runs/${{github.run_id}} for details.
+          to: ${{secrets.MAIL_TO}}
+          from: Github Actions <${{secrets.MAIL_FROM}}>
diff --git a/CHANGES b/CHANGES
index 03001734cb..7ad0d1d266 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+4.2.0-dev.38 | 2021-07-20 09:55:59 -0700
+
+  * Fix generate-docs github action to send email when it fails (Tim Wojtulewicz, Corelight)
+
+  * Use Cirrus's new greedy mode for parallelizing builds and tests (Christian Kreibich, Corelight)
+
+    This oversubscribes our cores 2x, which testing shows we actually
+    run with at times: speedup is around a third on average for builds,
+    and a bit more than that for testing.
+
+    Also some light Bashification in ci/build.sh, for consistency.
+
 4.2.0-dev.34 | 2021-07-19 08:56:45 -0700
 
   * Bump highwayhash to pull in FreeBSD 14 fix (Christian Kreibich, Corelight)
diff --git a/VERSION b/VERSION
index 779d51b8bc..085c7208d2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.2.0-dev.34
+4.2.0-dev.38