Merge branch 'master' into fix-eval

Author: mergify[bot]

.mergify.yml

@@ -1,16 +1,14 @@
 queue_rules:
   - name: default
+    queue_conditions:
+      - base=master
+      - label~=merge-queue|dependencies
     merge_conditions:
       - check-success=buildbot/nix-build
-defaults:
-  actions:
-    queue:
-      allow_merging_configuration_change: true
-      method: rebase
+    merge_method: rebase
+
 pull_request_rules:
   - name: merge using the merge queue
-    conditions:
-      - base=master
-      - label~=merge-queue|dependencies
+    conditions: []
     actions:
-      queue: {}
+      queue: