]> git.ipfire.org Git - thirdparty/unbound.git/log
thirdparty/unbound.git
4 years ago- Move the NSEC3 max iterations count in line with the 150 value
W.C.A. Wijngaards [Tue, 25 May 2021 12:35:19 +0000 (14:35 +0200)] 
- Move the NSEC3 max iterations count in line with the 150 value
  used by BIND, Knot and PowerDNS. This sets the default value
  for it in the configuration to 150 for all key sizes.

4 years agoMerge branch 'svcb' of github.com:NLnetLabs/unbound into svcb
Tom Carpay [Tue, 25 May 2021 09:43:50 +0000 (11:43 +0200)] 
Merge branch 'svcb' of github.com:NLnetLabs/unbound into svcb

4 years agofix multiple ipv6hints entries
Tom Carpay [Tue, 25 May 2021 09:43:46 +0000 (11:43 +0200)] 
fix multiple ipv6hints entries

4 years agoShift data pointer when scanning svcb wire data
Willem Toorop [Tue, 25 May 2021 08:41:00 +0000 (10:41 +0200)] 
Shift data pointer when scanning svcb wire data

Also make internal auxilary functions static

4 years agoFix str2wire ipv6hint like ipv4hint was fixed
Willem Toorop [Tue, 25 May 2021 08:37:44 +0000 (10:37 +0200)] 
Fix str2wire ipv6hint like ipv4hint was fixed

4 years agoFix generation of libunbound.pc 493/head
Jaap Akkerhuis [Mon, 24 May 2021 10:41:09 +0000 (12:41 +0200)] 
Fix generation of libunbound.pc

4 years ago- Test code has -q option for quiet output.
W.C.A. Wijngaards [Fri, 21 May 2021 15:08:58 +0000 (17:08 +0200)] 
- Test code has -q option for quiet output.

4 years agoApply suggestions from code review
TCY16 [Fri, 21 May 2021 14:09:18 +0000 (16:09 +0200)] 
Apply suggestions from code review

Co-authored-by: Willem Toorop <willem@nlnetlabs.nl>
4 years agoApply suggestions from code review
TCY16 [Fri, 21 May 2021 13:42:56 +0000 (15:42 +0200)] 
Apply suggestions from code review

Co-authored-by: Willem Toorop <willem@nlnetlabs.nl>
4 years ago- rpz-triggers, silence qname trigger explanation in rpz-log, this is
W.C.A. Wijngaards [Fri, 21 May 2021 12:56:38 +0000 (14:56 +0200)] 
- rpz-triggers, silence qname trigger explanation in rpz-log, this is
  backwards compatible.

4 years agoMerge branch 'master' into rpz-triggers
W.C.A. Wijngaards [Fri, 21 May 2021 12:09:30 +0000 (14:09 +0200)] 
Merge branch 'master' into rpz-triggers

4 years ago- rpz-triggers, rpz log and stats for nsip and clientip and nsdname.
W.C.A. Wijngaards [Fri, 21 May 2021 12:05:19 +0000 (14:05 +0200)] 
- rpz-triggers, rpz log and stats for nsip and clientip and nsdname.

4 years agohappyflow for all signle svcparams (now without debug prints)
Tom Carpay [Thu, 20 May 2021 11:39:24 +0000 (13:39 +0200)] 
happyflow for all signle svcparams (now without debug prints)

4 years agohappyflow for all signle svcparams
Tom Carpay [Thu, 20 May 2021 11:28:34 +0000 (13:28 +0200)] 
happyflow for all signle svcparams

4 years ago- Fix for #411, #439, #469: Reset the DNS message ID when moving queries
George Thessalonikefs [Wed, 19 May 2021 12:59:33 +0000 (14:59 +0200)] 
- Fix for #411, #439, #469: Reset the DNS message ID when moving queries
  between TCP streams.
- Refactor for uniform way to produce random DNS message IDs.

4 years ago- rpz-triggers, spelling fix in comment.
W.C.A. Wijngaards [Wed, 19 May 2021 09:40:31 +0000 (11:40 +0200)] 
- rpz-triggers, spelling fix in comment.

4 years agoFix date in changelog.
W.C.A. Wijngaards [Mon, 17 May 2021 07:13:29 +0000 (09:13 +0200)] 
Fix date in changelog.

4 years ago- Fix #489: Compile using MSYS2 MinGW 64-bit.
W.C.A. Wijngaards [Mon, 17 May 2021 06:43:46 +0000 (08:43 +0200)] 
- Fix #489: Compile using MSYS2 MinGW 64-bit.

4 years ago- rpz-triggers, check for alloc failure and zone for add rpz soa.
W.C.A. Wijngaards [Fri, 14 May 2021 15:27:15 +0000 (17:27 +0200)] 
- rpz-triggers, check for alloc failure and zone for add rpz soa.

4 years ago- rpz-triggers, in callback from iterator, if rpz is disabled, skip.
W.C.A. Wijngaards [Fri, 14 May 2021 14:41:54 +0000 (16:41 +0200)] 
- rpz-triggers, in callback from iterator, if rpz is disabled, skip.

4 years ago- rpz-triggers, the added soa for client ip modified answers is affected
W.C.A. Wijngaards [Fri, 14 May 2021 14:34:38 +0000 (16:34 +0200)] 
- rpz-triggers, the added soa for client ip modified answers is affected
  by the minimal-responses config option.

4 years ago- rpz-triggers, add rpz SOA when minimal responses is not set.
W.C.A. Wijngaards [Fri, 14 May 2021 14:28:55 +0000 (16:28 +0200)] 
- rpz-triggers, add rpz SOA when minimal responses is not set.

4 years ago- rpz-triggers, for clientip modified answers the rpz SOA is added to the
W.C.A. Wijngaards [Fri, 14 May 2021 13:34:48 +0000 (15:34 +0200)] 
- rpz-triggers, for clientip modified answers the rpz SOA is added to the
  additional section with the serial number and name of the rpz zone that
  was applied.

4 years ago- rpz-triggers, use zone for local data zone based answer if available.
W.C.A. Wijngaards [Fri, 14 May 2021 12:04:42 +0000 (14:04 +0200)] 
- rpz-triggers, use zone for local data zone based answer if available.

4 years ago- rpz-triggers, fix comments, log no zone answers.
W.C.A. Wijngaards [Fri, 14 May 2021 11:57:04 +0000 (13:57 +0200)] 
- rpz-triggers, fix comments, log no zone answers.

4 years ago- rpz-triggers, call module local callback for rpz local encode replies.
W.C.A. Wijngaards [Fri, 14 May 2021 11:42:54 +0000 (13:42 +0200)] 
- rpz-triggers, call module local callback for rpz local encode replies.

4 years ago- rpz-triggers, fix memory allocation trouble on allocation error path.
W.C.A. Wijngaards [Fri, 14 May 2021 11:35:24 +0000 (13:35 +0200)] 
- rpz-triggers, fix memory allocation trouble on allocation error path.

4 years ago- rpz-triggers, use sec_status_insecure like respip, AA flag on RPZ responses.
W.C.A. Wijngaards [Fri, 14 May 2021 11:28:10 +0000 (13:28 +0200)] 
- rpz-triggers, use sec_status_insecure like respip, AA flag on RPZ responses.

4 years ago- rpz-triggers, fix compile warning
W.C.A. Wijngaards [Fri, 14 May 2021 11:25:21 +0000 (13:25 +0200)] 
- rpz-triggers, fix compile warning

4 years agoMerge branch 'master' into rpz-triggers
W.C.A. Wijngaards [Fri, 14 May 2021 06:47:56 +0000 (08:47 +0200)] 
Merge branch 'master' into rpz-triggers

4 years ago- Fix that auth-zone zonefiles use last TTL if no TTL is specified.
W.C.A. Wijngaards [Wed, 12 May 2021 15:24:03 +0000 (17:24 +0200)] 
- Fix that auth-zone zonefiles use last TTL if no TTL is specified.

4 years agofix memcpy of buffer for ech
Tom Carpay [Mon, 10 May 2021 12:19:50 +0000 (12:19 +0000)] 
fix memcpy of buffer for ech

4 years agobasic implementation of a selection of svcb params
Tom Carpay [Mon, 10 May 2021 09:03:08 +0000 (11:03 +0200)] 
basic implementation of a selection of svcb params

4 years agoChangelog note for #487
W.C.A. Wijngaards [Mon, 10 May 2021 06:18:15 +0000 (08:18 +0200)] 
Changelog note for #487
- Merge PR #487: ifdef RLIMIT_AS in recently added check.

4 years agoMerge pull request #487 from sthen/patch-1
Wouter Wijngaards [Mon, 10 May 2021 06:17:37 +0000 (08:17 +0200)] 
Merge pull request #487 from sthen/patch-1

ifdef RLIMIT_AS in recently added check

4 years agoifdef RLIMIT_AS in recently added check 487/head
Stuart Henderson [Sat, 8 May 2021 15:12:39 +0000 (15:12 +0000)] 
ifdef RLIMIT_AS in recently added check

Some OS still don't have RLIMIT_AS

4 years agoMake VAL_MAX_RESTART_COUNT configurable. 486/head
Florian Obser [Sat, 8 May 2021 14:56:32 +0000 (16:56 +0200)] 
Make VAL_MAX_RESTART_COUNT configurable.

unbound tries very hard (up to 6 authoritative servers) to find a
validating answer. This is not always desirable, for example on high
latency links.

4 years ago- Remove case fallthrough from deprecate-rsa-1024 code.
W.C.A. Wijngaards [Fri, 7 May 2021 15:06:09 +0000 (17:06 +0200)] 
- Remove case fallthrough from deprecate-rsa-1024 code.

4 years ago- Add ./configure --with-deprecate-rsa-1024 that turns off RSA 1024.
W.C.A. Wijngaards [Fri, 7 May 2021 12:28:20 +0000 (14:28 +0200)] 
- Add ./configure --with-deprecate-rsa-1024 that turns off RSA 1024.

4 years ago- Fix #485: Unbound occasionally reports broken stats.
W.C.A. Wijngaards [Fri, 7 May 2021 09:13:44 +0000 (11:13 +0200)] 
- Fix #485: Unbound occasionally reports broken stats.

4 years ago- Rerun flex and bison.
W.C.A. Wijngaards [Tue, 4 May 2021 14:24:16 +0000 (16:24 +0200)] 
- Rerun flex and bison.

4 years agoMerge branch 'master' of github.com:NLnetLabs/unbound
W.C.A. Wijngaards [Tue, 4 May 2021 14:21:51 +0000 (16:21 +0200)] 
Merge branch 'master' of github.com:NLnetLabs/unbound

4 years ago- Fix to squelch tcp socket bind failures when the interface is gone.
W.C.A. Wijngaards [Tue, 4 May 2021 14:21:42 +0000 (16:21 +0200)] 
- Fix to squelch tcp socket bind failures when the interface is gone.

4 years ago- Add more logging for out-of-memory cases.
George Thessalonikefs [Tue, 4 May 2021 13:39:06 +0000 (15:39 +0200)] 
- Add more logging for out-of-memory cases.

4 years ago- Fix for #367: only attempt to get the interface for queries
George Thessalonikefs [Tue, 4 May 2021 12:45:01 +0000 (14:45 +0200)] 
- Fix for #367: only attempt to get the interface for queries
  that are no longer on the tcp_waiting_list.

4 years agoClearer template text since not everyone can reopen GitHub issues.
George Thessalonikefs [Tue, 4 May 2021 11:42:00 +0000 (13:42 +0200)] 
Clearer template text since not everyone can reopen GitHub issues.

4 years agoChangelog note for #478
W.C.A. Wijngaards [Tue, 4 May 2021 08:25:32 +0000 (10:25 +0200)] 
Changelog note for #478
- Merge #478: Allow configuration of TCP timeout while waiting for
  response.

4 years agoMerge pull request #478 from edevil/tcp_auth_query_timeout
Wouter Wijngaards [Tue, 4 May 2021 08:24:42 +0000 (10:24 +0200)] 
Merge pull request #478 from edevil/tcp_auth_query_timeout

Allow configuration of TCP timeout while waiting for response

4 years agoChangelog note and improved comment.
W.C.A. Wijngaards [Mon, 3 May 2021 11:07:12 +0000 (13:07 +0200)] 
Changelog note and improved comment.
- Fix #481: Fix comment in configuration file.

4 years agoMerge pull request #481 from paulmenzel/fix-comment-in-conf-file
Wouter Wijngaards [Mon, 3 May 2021 11:05:27 +0000 (13:05 +0200)] 
Merge pull request #481 from paulmenzel/fix-comment-in-conf-file

Fix comment in configuration file

4 years agodoc/example.conf.in: Clarify comment for `auto-trust-anchor-file` 481/head
Paul Menzel [Mon, 3 May 2021 10:54:11 +0000 (12:54 +0200)] 
doc/example.conf.in: Clarify comment for `auto-trust-anchor-file`

Remove `And enable:` as it refers to the uncommented option.

Fixes: 01dd4a35 ("- Added explicit note on unbound-anchor usage:")
4 years agoMerge branch 'master' of github.com:NLnetLabs/unbound
W.C.A. Wijngaards [Thu, 29 Apr 2021 08:27:02 +0000 (10:27 +0200)] 
Merge branch 'master' of github.com:NLnetLabs/unbound

4 years ago- Add that log-servfail prints an IP address and more information
W.C.A. Wijngaards [Thu, 29 Apr 2021 08:24:35 +0000 (10:24 +0200)] 
- Add that log-servfail prints an IP address and more information
  about one of the last failures for that query.

4 years agoAllow configuration of TCP timeout while waiting for response 478/head
André Cruz [Tue, 27 Apr 2021 17:43:19 +0000 (18:43 +0100)] 
Allow configuration of TCP timeout while waiting for response

This allows us to configure how long Unbound will wait for a response
on a TCP connection.

4 years agoMerge pull request #479 from NLnetLabs/issue-templates
gthess [Wed, 28 Apr 2021 14:45:44 +0000 (16:45 +0200)] 
Merge pull request #479 from NLnetLabs/issue-templates

Create issue templates

4 years agoCreate issue templates 479/head
gthess [Wed, 28 Apr 2021 14:40:48 +0000 (16:40 +0200)] 
Create issue templates

Create issue templates for bug reports and feature requests.

4 years ago- Fix compiler warning for signed/unsigned comparison for
George Thessalonikefs [Wed, 28 Apr 2021 14:15:52 +0000 (16:15 +0200)] 
- Fix compiler warning for signed/unsigned comparison for
  max_reuse_tcp_queries.

4 years ago- Fix #474: always_null and others inside view.
W.C.A. Wijngaards [Wed, 28 Apr 2021 12:05:23 +0000 (14:05 +0200)] 
- Fix #474: always_null and others inside view.

4 years agoChangelog note for PR #470
W.C.A. Wijngaards [Mon, 26 Apr 2021 14:07:28 +0000 (16:07 +0200)] 
Changelog note for PR #470
- Merge #470 from edevil: Allow configuration of persistent TCP
  connections.

4 years agoMerge pull request #470 from edevil/configurable_tcp
Wouter Wijngaards [Mon, 26 Apr 2021 14:07:16 +0000 (16:07 +0200)] 
Merge pull request #470 from edevil/configurable_tcp

Allow configuration of persistent TCP connections

4 years ago- Fix that testcode dohclient has OpenSSL initialisation calls.
W.C.A. Wijngaards [Thu, 22 Apr 2021 07:41:04 +0000 (09:41 +0200)] 
- Fix that testcode dohclient has OpenSSL initialisation calls.

4 years ago- Further fix for #468: detect SSL_CTX_set_alpn_protos for build with
W.C.A. Wijngaards [Thu, 22 Apr 2021 07:05:43 +0000 (09:05 +0200)] 
- Further fix for #468: detect SSL_CTX_set_alpn_protos for build with
  OpenSSL 1.0.1.

4 years ago- Fix #468: OpenSSL 1.0.1 can no longer build Unbound.
W.C.A. Wijngaards [Thu, 22 Apr 2021 07:00:15 +0000 (09:00 +0200)] 
- Fix #468: OpenSSL 1.0.1 can no longer build Unbound.

4 years agoChangelog note for #466
W.C.A. Wijngaards [Thu, 22 Apr 2021 06:57:50 +0000 (08:57 +0200)] 
Changelog note for #466
- Merge #466 from FGasper: Support OpenSSLs that lack
  SSL_get0_alpn_selected.

4 years agoMerge pull request #466 from FGasper/feature_check_SSL_get0_alpn_selected
Wouter Wijngaards [Thu, 22 Apr 2021 06:57:33 +0000 (08:57 +0200)] 
Merge pull request #466 from FGasper/feature_check_SSL_get0_alpn_selected

Support OpenSSLs that lack SSL_get0_alpn_selected.

4 years agoAllow configuration of persistent TCP connections 470/head
André Cruz [Wed, 21 Apr 2021 12:50:45 +0000 (13:50 +0100)] 
Allow configuration of persistent TCP connections

Added 2 new options to configure previously hardcoded
values: max-reuse-tcp-queries and tcp-reuse-timeout. These
allow fine-grained control over how unbound uses persistent
TCP connections to authority servers.

4 years agoSupport OpenSSLs that lack SSL_get0_alpn_selected. 466/head
Felipe Gasper [Mon, 19 Apr 2021 17:05:50 +0000 (13:05 -0400)] 
Support OpenSSLs that lack SSL_get0_alpn_selected.

4 years agoSimple zonefile printer
Willem Toorop [Fri, 16 Apr 2021 14:07:04 +0000 (16:07 +0200)] 
Simple zonefile printer

(maybe I should have called it printzone?)

5 years ago- rpz-triggers, nicer logging for response IP triggers.
W.C.A. Wijngaards [Wed, 14 Apr 2021 14:35:39 +0000 (16:35 +0200)] 
- rpz-triggers, nicer logging for response IP triggers.

5 years ago- rpz-triggers, nicer logging for qname and clientip triggers.
W.C.A. Wijngaards [Wed, 14 Apr 2021 11:54:27 +0000 (13:54 +0200)] 
- rpz-triggers, nicer logging for qname and clientip triggers.

5 years ago- rpz-triggers, nicer logging for nsdname and nsip triggers, one line and
W.C.A. Wijngaards [Wed, 14 Apr 2021 10:11:11 +0000 (12:11 +0200)] 
- rpz-triggers, nicer logging for nsdname and nsip triggers, one line and
  only when it applies to the delegation point.

5 years agoMerge branch 'master' into rpz-triggers
W.C.A. Wijngaards [Wed, 14 Apr 2021 07:39:41 +0000 (09:39 +0200)] 
Merge branch 'master' into rpz-triggers

5 years ago- Remove unused functions worker_handle_reply and
George Thessalonikefs [Tue, 13 Apr 2021 12:54:26 +0000 (14:54 +0200)] 
- Remove unused functions worker_handle_reply and
  libworker_handle_reply.

5 years agoMerge branch 'master' of github.com:NLnetLabs/unbound
George Thessalonikefs [Tue, 13 Apr 2021 12:01:38 +0000 (14:01 +0200)] 
Merge branch 'master' of github.com:NLnetLabs/unbound

5 years ago- Fix documentation comment for files previously residing in checkconf/.
George Thessalonikefs [Tue, 13 Apr 2021 11:58:53 +0000 (13:58 +0200)] 
- Fix documentation comment for files previously residing in checkconf/.

5 years ago- Fix that nxdomain synthesis does not happen above the stub or
W.C.A. Wijngaards [Tue, 13 Apr 2021 11:52:57 +0000 (13:52 +0200)] 
- Fix that nxdomain synthesis does not happen above the stub or
  forward definition.

5 years ago- Fix (increase) verbosity level for iterator error log in
George Thessalonikefs [Mon, 12 Apr 2021 14:49:45 +0000 (16:49 +0200)] 
- Fix (increase) verbosity level for iterator error log in
  processQueryTargets().

5 years ago- Fix permission denied sendto log, squelch the log messages
W.C.A. Wijngaards [Mon, 12 Apr 2021 09:18:23 +0000 (11:18 +0200)] 
- Fix permission denied sendto log, squelch the log messages
  unless high verbosity is set.

5 years ago- rebuild configure to set EXTRALINK to libunbound.la for #460.
W.C.A. Wijngaards [Fri, 9 Apr 2021 15:19:04 +0000 (17:19 +0200)] 
- rebuild configure to set EXTRALINK to libunbound.la for #460.

5 years ago- rpz-triggers, spelling
W.C.A. Wijngaards [Fri, 9 Apr 2021 06:38:18 +0000 (08:38 +0200)] 
- rpz-triggers, spelling

5 years ago- rpz-triggers, precedence fix for nsdname and nsip triggers.
W.C.A. Wijngaards [Thu, 8 Apr 2021 12:39:48 +0000 (14:39 +0200)] 
- rpz-triggers, precedence fix for nsdname and nsip triggers.

5 years agoMerge branch 'master' into rpz-triggers
W.C.A. Wijngaards [Thu, 8 Apr 2021 12:28:26 +0000 (14:28 +0200)] 
Merge branch 'master' into rpz-triggers

5 years ago- Fix for #411: Depth protect for crash on deleted element timeout.
W.C.A. Wijngaards [Thu, 8 Apr 2021 11:47:06 +0000 (13:47 +0200)] 
- Fix for #411: Depth protect for crash on deleted element timeout.

5 years agoDocument max-query-restarts option
Christian Allred [Tue, 6 Apr 2021 01:59:09 +0000 (18:59 -0700)] 
Document max-query-restarts option

5 years agoUse max-query-restarts in iterative resolver
Christian Allred [Mon, 5 Apr 2021 23:25:43 +0000 (16:25 -0700)] 
Use max-query-restarts in iterative resolver

5 years agoAdd max-query-restarts to grammar and lexer
Christian Allred [Mon, 5 Apr 2021 23:24:49 +0000 (16:24 -0700)] 
Add max-query-restarts to grammar and lexer

5 years agoAdd max-query-restarts config parameter
Christian Allred [Mon, 5 Apr 2021 22:41:53 +0000 (15:41 -0700)] 
Add max-query-restarts config parameter

5 years agoMerge branch 'master' into rpz-triggers
W.C.A. Wijngaards [Thu, 1 Apr 2021 12:34:25 +0000 (14:34 +0200)] 
Merge branch 'master' into rpz-triggers

5 years ago- Fix to stop IPv6 PMTU discovery.
W.C.A. Wijngaards [Thu, 1 Apr 2021 11:45:34 +0000 (13:45 +0200)] 
- Fix to stop IPv6 PMTU discovery.

5 years ago- rpz-triggers, fix what domain name to match for nsdname.
W.C.A. Wijngaards [Thu, 1 Apr 2021 11:11:51 +0000 (13:11 +0200)] 
- rpz-triggers, fix what domain name to match for nsdname.

5 years ago- rpz-triggers, remove unused test.
W.C.A. Wijngaards [Thu, 1 Apr 2021 10:56:47 +0000 (12:56 +0200)] 
- rpz-triggers, remove unused test.

5 years ago- rpz-triggers, separate cache storage of RPZ records from network records.
W.C.A. Wijngaards [Thu, 1 Apr 2021 10:06:14 +0000 (12:06 +0200)] 
- rpz-triggers, separate cache storage of RPZ records from network records.

5 years agoMerge branch 'master' into rpz-triggers
W.C.A. Wijngaards [Thu, 1 Apr 2021 08:56:54 +0000 (10:56 +0200)] 
Merge branch 'master' into rpz-triggers

5 years agoChangelog note for #460.
W.C.A. Wijngaards [Thu, 1 Apr 2021 07:12:50 +0000 (09:12 +0200)] 
Changelog note for #460.
- Merge #460 from orbea: build: Link with the libtool archive.

5 years agoMerge pull request #460 from orbea/libtool
Wouter Wijngaards [Thu, 1 Apr 2021 07:12:35 +0000 (09:12 +0200)] 
Merge pull request #460 from orbea/libtool

build: Link with the libtool archive.

5 years agobuild: Link with the libtool archive. 460/head
orbea [Wed, 31 Mar 2021 23:22:47 +0000 (16:22 -0700)] 
build: Link with the libtool archive.

5 years ago- Clean makedist.sh.
George Thessalonikefs [Wed, 31 Mar 2021 11:37:08 +0000 (13:37 +0200)] 
- Clean makedist.sh.

5 years ago- Fix stack-protector change to not override other CFLAGS options.
W.C.A. Wijngaards [Wed, 31 Mar 2021 08:01:42 +0000 (10:01 +0200)] 
- Fix stack-protector change to not override other CFLAGS options.

5 years ago- Disable the use of stack-protector for cross compiled 32-bit windows builds;
George Thessalonikefs [Tue, 30 Mar 2021 20:15:12 +0000 (22:15 +0200)] 
- Disable the use of stack-protector for cross compiled 32-bit windows builds;
  relates to #444.

5 years agoMerge branch 'master' into rpz-triggers
W.C.A. Wijngaards [Thu, 25 Mar 2021 16:28:53 +0000 (17:28 +0100)] 
Merge branch 'master' into rpz-triggers