Merge branch 'master' into timeout-anton

Author: trisk

.github/mergify.yml

@@ -15,7 +15,7 @@ pull_request_rules:
       - label=ready-to-merge
     actions:
       merge:
-        method: squash
+        method: merge
         commit_message_template: |
           {{ title }} (#{{ number }})