]> git.ipfire.org Git - thirdparty/unbound.git/log
thirdparty/unbound.git
4 years agobuild: Add missing linker flags. 449/head
orbea [Sun, 21 Mar 2021 23:28:58 +0000 (16:28 -0700)] 
build: Add missing linker flags.

4 years ago- Fix for #447: squelch connection refused tcp connection failures
W.C.A. Wijngaards [Fri, 19 Mar 2021 16:43:36 +0000 (17:43 +0100)] 
- Fix for #447: squelch connection refused tcp connection failures
  from the log, unless verbosity is high.

4 years ago- Fix #441: Minimal NSEC range not accepted for top level domains.
W.C.A. Wijngaards [Wed, 17 Mar 2021 13:04:02 +0000 (14:04 +0100)] 
- Fix #441: Minimal NSEC range not accepted for top level domains.

4 years ago- Fix parse of LOC RR type for decimetres.
W.C.A. Wijngaards [Thu, 11 Mar 2021 12:22:05 +0000 (13:22 +0100)] 
- Fix parse of LOC RR type for decimetres.

4 years agoput tls-use-sni: on a line of its own
Willem Toorop [Wed, 10 Mar 2021 14:14:45 +0000 (15:14 +0100)] 
put tls-use-sni: on a line of its own

Sorry about this, this must have happened when I added the entries for padding queries and responses.

4 years ago- Debug output for #411 and #439: printout internal error and details.
W.C.A. Wijngaards [Fri, 5 Mar 2021 12:54:26 +0000 (13:54 +0100)] 
- Debug output for #411 and #439: printout internal error and details.

4 years ago- Workaround for #439: prevent loops in the reuse rbtree.
W.C.A. Wijngaards [Fri, 5 Mar 2021 12:46:36 +0000 (13:46 +0100)] 
- Workaround for #439: prevent loops in the reuse rbtree.

4 years ago- Fix spurious errors about "Could not generate request: out of
W.C.A. Wijngaards [Thu, 4 Mar 2021 13:13:44 +0000 (14:13 +0100)] 
- Fix spurious errors about "Could not generate request: out of
  memory".  The mesh detect cycle routine no longer wrongly stops
  the check when the calling mesh state is unique.

4 years ago- iana portlist update.
W.C.A. Wijngaards [Thu, 4 Mar 2021 09:14:32 +0000 (10:14 +0100)] 
- iana portlist update.

4 years ago- Fix: Resolve interface names on control-interface too.
W.C.A. Wijngaards [Fri, 26 Feb 2021 12:54:10 +0000 (13:54 +0100)] 
- Fix: Resolve interface names on control-interface too.

4 years ago- Fix for #367: rc_ports don't have ub_sock; skip cleaning up.
George Thessalonikefs [Fri, 26 Feb 2021 12:13:37 +0000 (13:13 +0100)] 
- Fix for #367: rc_ports don't have ub_sock; skip cleaning up.

4 years ago- Fix to allow rpz with wildcard that applies to all TLDs at once.
W.C.A. Wijngaards [Thu, 25 Feb 2021 15:54:32 +0000 (16:54 +0100)] 
- Fix to allow rpz with wildcard that applies to all TLDs at once.

4 years agoChangelog note for #365, #367 and #368.
W.C.A. Wijngaards [Thu, 25 Feb 2021 11:00:28 +0000 (12:00 +0100)] 
Changelog note for #365, #367 and #368.
- Merge PR #367 : DNSTAP log local address.  With code from PR #365
  and fixes #368 : dnstap does not log the DNS message ID for
  FORWARDER_QUERY.

4 years agoMerge pull request #367 from NLnetLabs/dnstap-log-local-addr
Wouter Wijngaards [Thu, 25 Feb 2021 10:58:36 +0000 (11:58 +0100)] 
Merge pull request #367 from NLnetLabs/dnstap-log-local-addr

DNSTAP log local address

4 years agoFix comment item. 367/head
W.C.A. Wijngaards [Thu, 25 Feb 2021 07:50:02 +0000 (08:50 +0100)] 
Fix comment item.

4 years agoFix to use a simple pointer in the call of make_sock and make_sock_port.
W.C.A. Wijngaards [Wed, 24 Feb 2021 16:36:22 +0000 (17:36 +0100)] 
Fix to use a simple pointer in the call of make_sock and make_sock_port.

4 years ago- spelling fix in header.
W.C.A. Wijngaards [Wed, 24 Feb 2021 15:56:57 +0000 (16:56 +0100)] 
- spelling fix in header.

4 years ago- Fix unit test for added ulimit checks.
W.C.A. Wijngaards [Wed, 24 Feb 2021 14:30:12 +0000 (15:30 +0100)] 
- Fix unit test for added ulimit checks.

4 years ago- Fix function documentation.
W.C.A. Wijngaards [Wed, 24 Feb 2021 14:25:12 +0000 (15:25 +0100)] 
- Fix function documentation.

4 years ago- On startup of unbound it checks if rlimits on memory size look
W.C.A. Wijngaards [Wed, 24 Feb 2021 13:14:33 +0000 (14:14 +0100)] 
- On startup of unbound it checks if rlimits on memory size look
  sufficient for the configured cache size, and logs warning if not.

4 years ago- ipsecmod: Better logging for detecting a cycle when attaching the
George Thessalonikefs [Wed, 24 Feb 2021 12:59:31 +0000 (13:59 +0100)] 
- ipsecmod: Better logging for detecting a cycle when attaching the
  A/AAAA subquery.

4 years ago- Fix #384: (1) A minor request to improve the log (2) A minor bug in
George Thessalonikefs [Wed, 24 Feb 2021 10:57:48 +0000 (11:57 +0100)] 
- Fix #384: (1) A minor request to improve the log (2) A minor bug in
  one log message.

4 years ago- Fix for zonemd, do not reject insecure result from trust anchor
W.C.A. Wijngaards [Tue, 23 Feb 2021 16:09:40 +0000 (17:09 +0100)] 
- Fix for zonemd, do not reject insecure result from trust anchor
  validation step in dnssec chain of trust.

4 years ago- Fix for zonemd, that domain-insecure zones work without dnssec.
W.C.A. Wijngaards [Tue, 23 Feb 2021 16:03:23 +0000 (17:03 +0100)] 
- Fix for zonemd, that domain-insecure zones work without dnssec.

4 years agoSpelling fix.
W.C.A. Wijngaards [Mon, 22 Feb 2021 16:34:02 +0000 (17:34 +0100)] 
Spelling fix.

4 years ago- Fix for zonemd, that nxdomain for the chain of trust is allowed
W.C.A. Wijngaards [Mon, 22 Feb 2021 16:32:40 +0000 (17:32 +0100)] 
- Fix for zonemd, that nxdomain for the chain of trust is allowed
  for island zones, it is treates as an insecure zone for verification.

4 years ago- Fix #431: Squelch permission denied errors for tcp connect
W.C.A. Wijngaards [Mon, 22 Feb 2021 07:24:04 +0000 (08:24 +0100)] 
- Fix #431: Squelch permission denied errors for tcp connect

4 years ago- rpz skip nsec3param records, and nicer log for unsupported actions.
W.C.A. Wijngaards [Fri, 19 Feb 2021 14:00:39 +0000 (15:00 +0100)] 
- rpz skip nsec3param records, and nicer log for unsupported actions.

4 years ago- Fix #429: rpz: url: with https: broken (regression in 1.13.1).
W.C.A. Wijngaards [Fri, 19 Feb 2021 13:42:02 +0000 (14:42 +0100)] 
- Fix #429: rpz: url: with https: broken (regression in 1.13.1).

4 years agoMerge branch 'master' into dnstap-log-local-addr
W.C.A. Wijngaards [Thu, 18 Feb 2021 12:12:09 +0000 (13:12 +0100)] 
Merge branch 'master' into dnstap-log-local-addr

4 years ago- Fix doxygen and pydoc warnings.
W.C.A. Wijngaards [Thu, 18 Feb 2021 10:39:06 +0000 (11:39 +0100)] 
- Fix doxygen and pydoc warnings.

4 years agoMerge pull request #317 from NLnetLabs/zonemd
Wouter Wijngaards [Thu, 18 Feb 2021 10:17:04 +0000 (11:17 +0100)] 
Merge pull request #317 from NLnetLabs/zonemd

ZONEMD Zone Verification

4 years agoChangelog note for #317 317/head
W.C.A. Wijngaards [Thu, 18 Feb 2021 10:16:19 +0000 (11:16 +0100)] 
Changelog note for #317
- Merge PR #317: ZONEMD Zone Verification, with RFC 8976 support.
  ZONEMD records are checked for zones loaded as auth-zone,
  with DNSSEC if available.  There is an added option
  zonemd-permissive-mode that makes it log but not fail wrong zones.
  With zonemd-reject-absence for an auth-zone the presence of a
  zonemd can be mandated for specific zones.

4 years agoMerge branch 'master' into zonemd
W.C.A. Wijngaards [Thu, 18 Feb 2021 10:11:50 +0000 (11:11 +0100)] 
Merge branch 'master' into zonemd

4 years agoMerge pull request #427 from vstinner/fopen
Wouter Wijngaards [Tue, 16 Feb 2021 10:58:56 +0000 (11:58 +0100)] 
Merge pull request #427 from vstinner/fopen

Fix #426: Replace _Py_fopen() with fopen() in pythonmod.c

4 years agoFix #426: Replace _Py_fopen() with fopen() in pythonmod.c 427/head
Victor Stinner [Tue, 16 Feb 2021 10:11:06 +0000 (11:11 +0100)] 
Fix #426: Replace _Py_fopen() with fopen() in pythonmod.c

The private _Py_fopen() function has been removed in Python 3.10.

Fix build on Python 3.10.

4 years ago- Fix to make tests work with support indicators set for iterator.
W.C.A. Wijngaards [Mon, 15 Feb 2021 13:57:29 +0000 (14:57 +0100)] 
- Fix to make tests work with support indicators set for iterator.

4 years ago- Fix #422: IPv6 fallback issues when IPv6 is not properly
W.C.A. Wijngaards [Mon, 15 Feb 2021 13:40:48 +0000 (14:40 +0100)] 
- Fix #422: IPv6 fallback issues when IPv6 is not properly
  enabled/configured.

4 years agoMerge branch 'master' into zonemd
W.C.A. Wijngaards [Fri, 12 Feb 2021 16:21:51 +0000 (17:21 +0100)] 
Merge branch 'master' into zonemd

4 years agozonemd, review comments, spelling fix.
W.C.A. Wijngaards [Fri, 12 Feb 2021 09:48:38 +0000 (10:48 +0100)] 
zonemd, review comments, spelling fix.

4 years agozonemd, review comments, fix no anchor lookup if none.
W.C.A. Wijngaards [Fri, 12 Feb 2021 08:16:22 +0000 (09:16 +0100)] 
zonemd, review comments, fix no anchor lookup if none.

4 years agozonemd, review comments, stop null dnskey, skip dnssec for insecure islands.
W.C.A. Wijngaards [Fri, 12 Feb 2021 07:33:03 +0000 (08:33 +0100)] 
zonemd, review comments, stop null dnskey, skip dnssec for insecure islands.

4 years agozonemd, review comments, check qname for zonemd dnskey lookup.
W.C.A. Wijngaards [Thu, 11 Feb 2021 16:33:10 +0000 (17:33 +0100)] 
zonemd, review comments, check qname for zonemd dnskey lookup.

4 years agozonemd, review comments, stop callback for a deleted zone.
W.C.A. Wijngaards [Thu, 11 Feb 2021 16:27:59 +0000 (17:27 +0100)] 
zonemd, review comments, stop callback for a deleted zone.

4 years agozonemd, review comments, indentation.
W.C.A. Wijngaards [Thu, 11 Feb 2021 15:05:28 +0000 (16:05 +0100)] 
zonemd, review comments, indentation.

4 years agozonemd, review comments, compare list size for rrsigtype add.
W.C.A. Wijngaards [Wed, 10 Feb 2021 15:38:39 +0000 (16:38 +0100)] 
zonemd, review comments, compare list size for rrsigtype add.

4 years agozonemd, review comments, compare list size correctly.
W.C.A. Wijngaards [Wed, 10 Feb 2021 15:34:24 +0000 (16:34 +0100)] 
zonemd, review comments, compare list size correctly.

4 years agozonemd, review comments, add comments to unit test, scope verbose output.
W.C.A. Wijngaards [Wed, 10 Feb 2021 14:30:23 +0000 (15:30 +0100)] 
zonemd, review comments, add comments to unit test, scope verbose output.

4 years agoChangelog note for PR #420
W.C.A. Wijngaards [Wed, 10 Feb 2021 10:26:21 +0000 (11:26 +0100)] 
Changelog note for PR #420
- Merge PR #420 from dyunwei: DOH not responsing with
  "http2_query_read_done failure" logged.

4 years agoMerge pull request #420 from dyunwei/master
Wouter Wijngaards [Wed, 10 Feb 2021 10:25:56 +0000 (11:25 +0100)] 
Merge pull request #420 from dyunwei/master

DOH not responsing with "http2_query_read_done failure" logged

4 years agoMerge pull request #1 from NLnetLabs/master 420/head
yunwei [Wed, 10 Feb 2021 01:03:38 +0000 (09:03 +0800)] 
Merge pull request #1 from NLnetLabs/master

synchronize the code.

4 years ago- Fix for Python 3.9, no longer use deprecated functions of
W.C.A. Wijngaards [Tue, 9 Feb 2021 09:38:55 +0000 (10:38 +0100)] 
- Fix for Python 3.9, no longer use deprecated functions of
  PyEval_CallObject (now PyObject_Call), PyEval_InitThreads (now
  none), PyParser_SimpleParseFile (now Py_CompileString).

4 years agoChangelog note for 1.13.1 release and main branch is 1.13.2 in development.
W.C.A. Wijngaards [Tue, 9 Feb 2021 08:16:23 +0000 (09:16 +0100)] 
Changelog note for 1.13.1 release and main branch is 1.13.2 in development.

4 years agozonemd, fix unit test to allow nonvalidating zone without zonemd with
W.C.A. Wijngaards [Thu, 4 Feb 2021 15:18:02 +0000 (16:18 +0100)] 
zonemd, fix unit test to allow nonvalidating zone without zonemd with
permissive mode for zonemd.

4 years agoMerge branch 'master' into zonemd
W.C.A. Wijngaards [Thu, 4 Feb 2021 15:08:11 +0000 (16:08 +0100)] 
Merge branch 'master' into zonemd

4 years ago- release 1.13.1rc2 tag on branch-1.13.1 with added changes of 2 feb.
W.C.A. Wijngaards [Thu, 4 Feb 2021 08:18:40 +0000 (09:18 +0100)] 
- release 1.13.1rc2 tag on branch-1.13.1 with added changes of 2 feb.

4 years ago- Fix indentation of root anchor for use by windows install script. release-1.13.1 release-1.13.1rc2
W.C.A. Wijngaards [Tue, 2 Feb 2021 16:04:29 +0000 (17:04 +0100)] 
- Fix indentation of root anchor for use by windows install script.

4 years agoFixup to add to LIBS.
W.C.A. Wijngaards [Tue, 2 Feb 2021 13:52:05 +0000 (14:52 +0100)] 
Fixup to add to LIBS.

4 years agoAnd autoconf.
W.C.A. Wijngaards [Tue, 2 Feb 2021 13:31:05 +0000 (14:31 +0100)] 
And autoconf.

4 years ago- Fix windows dependency on libssp.dll because of default stack
W.C.A. Wijngaards [Tue, 2 Feb 2021 13:30:53 +0000 (14:30 +0100)] 
- Fix windows dependency on libssp.dll because of default stack
  protector in mingw.

4 years ago- Fix dynlibmod link on rhel8 for -ldl inclusion.
W.C.A. Wijngaards [Tue, 2 Feb 2021 12:18:18 +0000 (13:18 +0100)] 
- Fix dynlibmod link on rhel8 for -ldl inclusion.

4 years ago- branch-1.13.1 is created, with release-1.13.1rc1 tag.
W.C.A. Wijngaards [Tue, 2 Feb 2021 07:48:44 +0000 (08:48 +0100)] 
- branch-1.13.1 is created, with release-1.13.1rc1 tag.

4 years ago- Hide our time traveling abilities. release-1.13.1rc1
George Thessalonikefs [Mon, 1 Feb 2021 16:02:19 +0000 (17:02 +0100)] 
- Hide our time traveling abilities.

4 years agoMerge branch 'master' of github.com:NLnetLabs/unbound
George Thessalonikefs [Mon, 1 Feb 2021 15:59:19 +0000 (16:59 +0100)] 
Merge branch 'master' of github.com:NLnetLabs/unbound

4 years ago- Attempt to fix NULL keys in the reuse_tcp tree; relates to #411.
George Thessalonikefs [Mon, 1 Feb 2021 15:57:56 +0000 (16:57 +0100)] 
- Attempt to fix NULL keys in the reuse_tcp tree; relates to #411.

4 years ago- Fix for doxygen 1.8.20 compatibility.
W.C.A. Wijngaards [Fri, 29 Jan 2021 15:34:46 +0000 (16:34 +0100)] 
- Fix for doxygen 1.8.20 compatibility.

4 years ago- Fix fwd ancil test post script when not supported.
W.C.A. Wijngaards [Thu, 28 Jan 2021 10:19:34 +0000 (11:19 +0100)] 
- Fix fwd ancil test post script when not supported.

4 years ago- Fix empty clause warning in edns pass for padding.
W.C.A. Wijngaards [Thu, 28 Jan 2021 08:15:45 +0000 (09:15 +0100)] 
- Fix empty clause warning in edns pass for padding.

4 years ago- Fix to use correct type for label count in ipdnametoaddr rpz routine.
W.C.A. Wijngaards [Thu, 28 Jan 2021 08:14:19 +0000 (09:14 +0100)] 
- Fix to use correct type for label count in ipdnametoaddr rpz routine.

4 years ago- Fix empty clause warning in config_file nsid parse.
W.C.A. Wijngaards [Thu, 28 Jan 2021 08:11:46 +0000 (09:11 +0100)] 
- Fix empty clause warning in config_file nsid parse.

4 years ago- Fix to use correct type for label count in rpz routine.
W.C.A. Wijngaards [Thu, 28 Jan 2021 08:07:16 +0000 (09:07 +0100)] 
- Fix to use correct type for label count in rpz routine.

4 years ago- Annotate that we ignore the return value of if_indextoname.
W.C.A. Wijngaards [Thu, 28 Jan 2021 08:04:00 +0000 (09:04 +0100)] 
- Annotate that we ignore the return value of if_indextoname.

4 years ago- Fix compile of unbound-dnstap-socket without dnstap installed.
W.C.A. Wijngaards [Tue, 26 Jan 2021 16:29:22 +0000 (17:29 +0100)] 
- Fix compile of unbound-dnstap-socket without dnstap installed.

4 years ago- Ignore cache blacklisting when trying to reply with expired data from
George Thessalonikefs [Tue, 26 Jan 2021 14:31:50 +0000 (15:31 +0100)] 
- Ignore cache blacklisting when trying to reply with expired data from
  cache. (#394)

4 years agoChangelog entry for:
George Thessalonikefs [Tue, 26 Jan 2021 12:19:05 +0000 (13:19 +0100)] 
Changelog entry for:
- Merge PR #355 from noloader: Make ICANN Update CA and DS Trust Anchor
  static data.

4 years agoMerge branch 'noloader-icann-ca-trust-ds'
George Thessalonikefs [Tue, 26 Jan 2021 12:18:00 +0000 (13:18 +0100)] 
Merge branch 'noloader-icann-ca-trust-ds'

4 years agoMerge branch 'master' of git://github.com/noloader/unbound into noloader-icann-ca...
George Thessalonikefs [Tue, 26 Jan 2021 12:04:55 +0000 (13:04 +0100)] 
Merge branch 'master' of git://github.com/noloader/unbound into noloader-icann-ca-trust-ds

4 years agoChangelog entry for:
George Thessalonikefs [Tue, 26 Jan 2021 12:01:33 +0000 (13:01 +0100)] 
Changelog entry for:
- Merge PR #275 by Roland van Rijswijk-Deij, Add feature to return the
  original instead of a decrementing TTL ('serve-original-ttl').

4 years agoMerge branch 'rijswijk-orig_ttl'
George Thessalonikefs [Tue, 26 Jan 2021 11:58:38 +0000 (12:58 +0100)] 
Merge branch 'rijswijk-orig_ttl'

4 years agoChangelog entry for:
George Thessalonikefs [Tue, 26 Jan 2021 11:55:55 +0000 (12:55 +0100)] 
Changelog entry for:
- Merge PR #408 from fobser: Prevent a few more yacc clashes.

4 years agoMerge branch 'fobser-yacc-clashes'
George Thessalonikefs [Tue, 26 Jan 2021 11:53:55 +0000 (12:53 +0100)] 
Merge branch 'fobser-yacc-clashes'

4 years agoMerge branch 'yacc-clashes' of https://github.com/fobser/unbound into fobser-yacc...
George Thessalonikefs [Mon, 25 Jan 2021 19:56:36 +0000 (20:56 +0100)] 
Merge branch 'yacc-clashes' of https://github.com/fobser/unbound into fobser-yacc-clashes

4 years ago- Update example.con.in and add a testcase for PR #275.
George Thessalonikefs [Mon, 25 Jan 2021 18:26:19 +0000 (19:26 +0100)] 
- Update example.con.in and add a testcase for PR #275.

4 years agoMerge branch 'orig_ttl' of https://github.com/rijswijk/unbound into rijswijk-orig_ttl
George Thessalonikefs [Mon, 25 Jan 2021 16:39:24 +0000 (17:39 +0100)] 
Merge branch 'orig_ttl' of https://github.com/rijswijk/unbound into rijswijk-orig_ttl

4 years agoMerge pull request #211 from NLnetLabs/features/padding
Willem Toorop [Mon, 25 Jan 2021 14:14:33 +0000 (15:14 +0100)] 
Merge pull request #211 from NLnetLabs/features/padding

Down- and upstream padding a la RFC7830 & RFC8467

4 years agoSome review nits from George 211/head
Willem Toorop [Mon, 25 Jan 2021 14:13:54 +0000 (15:13 +0100)] 
Some review nits from George

4 years agoTest some different padding sizes
Willem Toorop [Sun, 24 Jan 2021 19:17:44 +0000 (20:17 +0100)] 
Test some different padding sizes

4 years agopadding.tdir text in single TXT RR
Willem Toorop [Sun, 24 Jan 2021 17:29:00 +0000 (18:29 +0100)] 
padding.tdir text in single TXT RR

So the sentences are not re-ordered and the text makes sense!

4 years agotdir test for padding option
Willem Toorop [Sun, 24 Jan 2021 17:12:08 +0000 (18:12 +0100)] 
tdir test for padding option

4 years agoAddressed review comment from @wcawijngaards 275/head
Roland van Rijswijk-Deij [Fri, 22 Jan 2021 18:56:09 +0000 (18:56 +0000)] 
Addressed review comment from @wcawijngaards

4 years agoRebase on master
Roland van Rijswijk-Deij [Fri, 22 Jan 2021 16:44:56 +0000 (16:44 +0000)] 
Rebase on master

4 years agoChangelog entry for padding option
Willem Toorop [Fri, 22 Jan 2021 14:14:10 +0000 (15:14 +0100)] 
Changelog entry for padding option

4 years agoMerge branch 'master' into features/padding
Willem Toorop [Fri, 22 Jan 2021 14:13:01 +0000 (15:13 +0100)] 
Merge branch 'master' into features/padding

4 years agoMove NSID Changelog entry to day of merge
Willem Toorop [Fri, 22 Jan 2021 14:10:57 +0000 (15:10 +0100)] 
Move NSID Changelog entry to day of merge

4 years agozonemd, unit test for capitalisation of owner and ns names.
W.C.A. Wijngaards [Fri, 22 Jan 2021 13:40:21 +0000 (14:40 +0100)] 
zonemd, unit test for capitalisation of owner and ns names.

4 years agozonemd, fix to detect duplicate zonemd scheme and algo RRs.
W.C.A. Wijngaards [Fri, 22 Jan 2021 13:36:53 +0000 (14:36 +0100)] 
zonemd, fix to detect duplicate zonemd scheme and algo RRs.

4 years agoFixup if brackets.
W.C.A. Wijngaards [Fri, 22 Jan 2021 12:11:41 +0000 (13:11 +0100)] 
Fixup if brackets.

4 years agoMerge branch 'negative_soa_ttl'
George Thessalonikefs [Fri, 22 Jan 2021 11:39:16 +0000 (12:39 +0100)] 
Merge branch 'negative_soa_ttl'

4 years ago- Updated Changelog for PR #407. 407/head
George Thessalonikefs [Fri, 22 Jan 2021 11:33:56 +0000 (12:33 +0100)] 
- Updated Changelog for PR #407.

4 years agoMerge branch 'master' into features/padding
Willem Toorop [Fri, 22 Jan 2021 09:29:50 +0000 (10:29 +0100)] 
Merge branch 'master' into features/padding