Merge branch 'master' into use_generic_steering_state_msg

.github/mergify.yml

@@ -32,19 +32,19 @@ pull_request_rules:
  - author=mergify[bot]
  actions:
  comment:
- message: This pull request is in conflict. Could you fix it @bmagyar @dstogl @christophfroehlich?
+ message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich?
 
  - name: development targets master branch
  conditions:
  - base!=master
  - author!=bmagyar
- - author!=dstogl
+ - author!=destogl
  - author!=christophfroehlich
  - author!=mergify[bot]
  - author!=dependabot[bot]
  actions:
  comment:
  message: |
  @{{author}}, all pull requests must be targeted towards the `master` development branch.
- Once merged into `master`, it is possible to backport to @{{base}}, but it must be in `master`
+ Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
  to have these changes reflected into new distributions.