diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index e9d7df97..640e5b53 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 ### System information
 
-- **SolveSpace version:** <!--e.g. 3.0~3dd2fc00; go to Help → About...-->
+- **SolveSpace version:** <!--e.g. 3.1~70bde63c; go to Help → About… / SolveSpace → About SolveSpace (macOS)-->
 - **Operating system:** <!--e.g. Debian testing-->
 
 ### Expected behavior
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index e4e7c21a..ecd50bc4 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -12,14 +12,16 @@ jobs:
   cancel_previous_runs:
     runs-on: ubuntu-latest
     name: Cancel Previous Runs
+    permissions:
+      actions: write
     steps:
-    - uses: styfle/cancel-workflow-action@0.8.0
+    - uses: styfle/cancel-workflow-action@0.9.1
       with:
         access_token: ${{ github.token }}
 
   test_ubuntu:
     needs: [cancel_previous_runs]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     name: Test Ubuntu
     steps:
     - uses: actions/checkout@v2
@@ -43,7 +45,7 @@ jobs:
 
   test_macos:
     needs: [cancel_previous_runs]
-    runs-on: macos-10.15
+    runs-on: macos-latest
     name: Test macOS
     steps:
     - uses: actions/checkout@v2
@@ -91,7 +93,7 @@ jobs:
   build_release_macos:
     needs: [test_ubuntu, test_windows, test_macos]
     name: Build Release macOS
-    runs-on: macos-10.15
+    runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
     - name: Install Dependencies
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9042b8e8..23188859 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   test_ubuntu:
-      runs-on: ubuntu-18.04
+      runs-on: ubuntu-latest
       name: Test Ubuntu
       steps:
       - uses: actions/checkout@v2
@@ -34,7 +34,7 @@ jobs:
       shell: bash
 
   test_macos:
-    runs-on: macos-10.15
+    runs-on: macos-latest
     name: Test macOS
     steps:
     - uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa23cb31..0fc7018f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ Translations (now in 10 languages!)
 * Update translation for French fr_FR and Russian ru_RU.
 
 Other:
+* Pressing ESC while drawing a sketch entity now deletes the entity rather than completing it.
 * Merged and improved the experimental Emscripten port (web version).
 * Better Flatpack support.
 * More entity types described in the text screens.
diff --git a/src/graphicswin.cpp b/src/graphicswin.cpp
index 7033e772..65676255 100644
--- a/src/graphicswin.cpp
+++ b/src/graphicswin.cpp
@@ -1102,6 +1102,16 @@ void GraphicsWindow::MenuEdit(Command id) {
                     }
                 }
             }
+            // some pending operations need an Undo to properly clean up on ESC
+            if ( (SS.GW.pending.operation == Pending::DRAGGING_NEW_POINT)
+              || (SS.GW.pending.operation == Pending::DRAGGING_NEW_LINE_POINT)
+              || (SS.GW.pending.operation == Pending::DRAGGING_NEW_ARC_POINT)
+              || (SS.GW.pending.operation == Pending::DRAGGING_NEW_CUBIC_POINT)
+              || (SS.GW.pending.operation == Pending::DRAGGING_NEW_RADIUS) )
+            {
+              SS.GW.ClearSuper();
+              SS.UndoUndo();
+            }
             SS.GW.ClearSuper();
             SS.TW.HideEditControl();
             SS.nakedEdges.Clear();