Merge branch 'master' into dev

.github/workflows/branch-cleanup.yml

@@ -0,0 +1,11 @@
+name: branch-cleanup
+on:
+  pull_request:
+    branches:
+      - dev
+jobs:
+  cleanup-branch:
+    name: on pull request merge, delete the branch
+    runs-on: ubuntu-latest
+    steps:
+    - uses: jessfraz/branch-cleanup-action@master

.github/workflows/rebase.yml

@@ -1,18 +0,0 @@
-on:
-  issue_comment:
-    types: [created]
-name: Automatic Rebase
-jobs:
-  rebase:
-    name: Rebase
-    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout the latest code
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.3.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}