Commit Graph

3327 Commits

Author SHA1 Message Date
Mariusz Felisiak 9a17ae50c6 [2.2.x] Fixed #31021 -- Fixed proxy model permissions data migration crash with a multiple databases setup.
Regression in 98296f86b3.

Backport of e8fcdaad5c from master
2019-11-29 11:10:59 +01:00
Sergey Fedoseev c2a8a69b72 [2.2.x] Used 🎫 role in all tickets links.
Backport of abc51d44af from master.
2019-11-26 14:45:15 +01:00
Baptiste Mispelon 7873d3757d [2.2.x] Fixed #31031 -- Fixed data loss in admin changelist view when formset's prefix contains regex special chars.
Regression in b18650a263.

Backport of 52936eface from master
2019-11-26 09:19:39 +01:00
Hasan Ramezani 8a8ea93b98 [2.2.x] Fixed #30625 -- Doc'd cache.get()/delete() behavior change in Django 2.2.
Backport of f69b32782e from master
2019-11-21 10:55:16 +01:00
Mariusz Felisiak 4082f078bc [2.2.x] Added stub release notes for 2.1.15.
Backport of e9def97d10 from master
2019-11-19 12:45:04 +01:00
Mariusz Felisiak 622158b371 [2.2.x] Refs #29926 -- Doc'd Python 3.8 compatibility in Django 2.2.x.
Backport of b93a0e34d9 from master.
2019-11-12 22:15:27 +01:00
Mariusz Felisiak 90c730d963 [2.2.x] Added stub release notes for 2.2.8 release.
Backport of 30359496a3 from master
2019-11-12 14:42:34 +01:00
Mariusz Felisiak 6f26693cc8 [2.2.x] Added release dates for 2.2.7, 2.1.14, and 1.11.26.
Backport of 126cfefce2 from master
2019-11-04 08:26:38 +01:00
Carlton Gibson 785d1706c4 [2.2.x] Fixed #30931 -- Restored ability to override Model.get_FIELD_display().
Thanks Sergey Fedoseev for the implementation idea.

Regression in a68ea23101.

Backport of 2d38eb0ab9 from master
2019-11-04 08:17:50 +01:00
Hannes Ljungberg 7fe09e6d41 [2.2.x] Fixed #30903 -- Fixed migrations crash on PostgreSQL when adding Index with opclasses and ordering.
Backport of fa5f3291e7 from master
2019-10-24 09:53:33 +02:00
Mariusz Felisiak d2f02aa56b [2.2.x] Fixed #30870 -- Fixed showing that RunPython operations are irreversible by migrate --plan.
Thanks Hasan Ramezani for the initial patch and Kyle Dickerson for the
report.

Backport of 06d34aab7c from master.
2019-10-14 11:45:47 +02:00
Louise Grandjonc 323467e286 [2.2.x] Fixed #30826 -- Fixed crash of many JSONField lookups when one hand side is key transform.
Regression in 6c3dfba892.

Backport of 7d1bf29977 from master
2019-10-11 11:52:32 +02:00
Mariusz Felisiak 18df8484bd [2.2.x] Added stub release notes for 1.11.26 and 2.1.14.
Backport of 84322a29ce from master
2019-10-02 07:56:02 +02:00
Carlton Gibson c3302c7976 [2.2.x] Added stub release notes for 2.2.7.
Backport of e1c1eaf0c6 from master
2019-10-01 10:45:07 +02:00
Carlton Gibson e1a75db7d1 [2.2.x] Added release dates for 2.2.6, 2.1.13, and 1.11.25.
Backport of 3826aed46d from master
2019-10-01 08:51:15 +02:00
Simon Charette 7806e45454 [2.2.x] Fixed #30769 -- Fixed a crash when filtering against a subquery JSON/HStoreField annotation.
This was a regression introduced by 7deeabc7c7
to address CVE-2019-14234.

Thanks Tim Kleinschmidt for the report and Mariusz for the tests.

Backport of 6c3dfba892 from master
2019-09-16 08:53:31 +02:00
Mariusz Felisiak e4fb132f43 [2.2.x] Added stub release notes for 1.11.25 and 2.1.13.
Backport of bd7e0f81f8 from master
2019-09-16 07:43:49 +02:00
Simon Charette 964dd4f4f2 [2.2.x] Fixed #30754 -- Prevented inclusion of aliases in partial index conditions.
SQLite doesn't repoint table aliases in partial index conditions on table
rename which breaks the documented table alteration procedure.

Thanks Pēteris Caune for the report.

Backport of 34decdebf1 from master
2019-09-10 10:04:12 +02:00
Mariusz Felisiak b71cabe459 [2.2.x] Added stub release notes for 2.2.6.
Backport of 0d4529d314 from master
2019-09-04 08:06:12 +02:00
Mariusz Felisiak 4ed59db199 [2.2.x] Added release dates for 2.2.5, 2.1.12, and 1.11.24.
Backport of 47f49adc11 from master
2019-09-02 07:45:40 +02:00
Tom Forbes 6402855098 [2.2.x] Fixed #30500 -- Fixed race condition in loading URLconf module. 2019-08-27 20:09:30 +02:00
François Freitag 9b7c5a92ec [2.2.x] Fixed broken links and redirects in documentation.
Removed reference to custom builds, feature removed in
8e6b3bba99.
Backport of 9a88e43aeb from master
2019-08-21 10:58:05 +02:00
zeyneloz c2732e6839 [2.2.x] Fixed #30449 -- Fixed RelatedFieldListFilter/RelatedOnlyFieldListFilter to respect model's Meta.ordering.
Regression in 6d4e5feb79.

Co-Authored-By: Mariusz Felisiak <felisiak.mariusz@gmail.com>

Backport of 00035672a4 from master
2019-08-15 13:14:17 +02:00
Mariusz Felisiak 52a7759a49 [2.2.x] Fixed #30672 -- Fixed crash of JSONField/HStoreField key transforms on expressions with params.
Regression in 4f5b58f5cd.

Thanks Florian Apolloner for the report and helping with tests.

Backport of 1f8382d34d from master.
2019-08-14 15:29:13 +02:00
Adnan Umer 1265a26b2f [2.2.x] Fixed #30673 -- Relaxed system check for db_table collision when database routers are installed by turning the error into a warning.
Backport of 8d3519071e from master.
2019-08-08 21:40:06 +02:00
Mariusz Felisiak 2c66f340bb [2.2.x] Added stub release notes for 2.2.5.
Backport of 1af469e67f from master
2019-08-03 11:28:47 +02:00
Carlton Gibson 68cc954ffb [2.2.x] Added CVE-2019-14235 to security release archive.
Backport of a5652eb795 from master
2019-08-01 12:04:18 +02:00
Carlton Gibson 3bfa2f99d8 [2.2.x] Added CVE-2019-14234 to security release archive.
Backport of 3a6a2f5eaf from master
2019-08-01 12:04:06 +02:00
Carlton Gibson 859d1d1cb0 [2.2.x] Added CVE-2019-14233 to security release archive.
Backport of 9600f63885 from master
2019-08-01 12:03:53 +02:00
Carlton Gibson 928d596886 [2.2.x] Added CVE-2019-14232 to the security release archive.
Backport of 87750787d1 from master
2019-08-01 12:03:34 +02:00
Florian Apolloner cf694e6852 [2.2.x] Fixed CVE-2019-14235 -- Fixed potential memory exhaustion in django.utils.encoding.uri_to_iri().
Thanks to Guido Vranken for initial report.
2019-07-29 11:06:54 +02:00
Mariusz Felisiak 4f5b58f5cd [2.2.x] Fixed CVE-2019-14234 -- Protected JSONField/HStoreField key and index lookups against SQL injection.
Thanks to Sage M. Abdullah for the report and initial patch.
Thanks Florian Apolloner for reviews.
2019-07-29 11:06:54 +02:00
Florian Apolloner e34f3c0e9e [2.2.x] Fixed CVE-2019-14233 -- Prevented excessive HTMLParser recursion in strip_tags() when handling incomplete HTML entities.
Thanks to Guido Vranken for initial report.
2019-07-29 11:06:54 +02:00
Florian Apolloner c3289717c6 [2.2.X] Fixed CVE-2019-14232 -- Adjusted regex to avoid backtracking issues when truncating HTML.
Thanks to Guido Vranken for initial report.
2019-07-29 11:00:01 +02:00
Carlton Gibson ea57c8a345 [2.2.x] Added stub release notes for security releases.
Backport of f13147c8de from master
2019-07-25 10:50:18 +02:00
Tom Forbes 4d6449e125 [2.2.x] Fixed #30647 -- Fixed crash of autoreloader when extra directory cannot be resolved.
Backport of fc75694257 from master.
2019-07-24 14:38:24 +02:00
Tom Forbes 2d2859bec2 [2.2.x] Fixed #30506 -- Fixed crash of autoreloader when path contains null characters.
Backport of 2ff517ccb6 from master.
2019-07-23 10:41:50 +02:00
Mariusz Felisiak 1088a9777d [2.2.x] Fixed #30621 -- Fixed crash of __contains lookup for Date/DateTimeRangeField when the right hand side is the same type.
Thanks Tilman Koschnick for the report and initial patch.
Thanks Carlton Gibson for the review.

Regression in 6b048b364c.
Backport of 7991111af1 from master
2019-07-10 10:34:49 +02:00
Simon Charette 9dee8515d6 [2.2.x] Fixed #30628 -- Adjusted expression identity to differentiate bound fields.
Expressions referring to different bound fields should not be
considered equal.

Thanks Julien Enselme for the detailed report.

Regression in bc7e288ca9.

Backport of ee6e93ec87 from master
2019-07-10 08:04:45 +02:00
Mariusz Felisiak b593c39d7f [2.2.x] Added stub release notes for 2.2.4.
Backport of 08e69cad9c from master
2019-07-09 07:45:27 +02:00
Mariusz Felisiak 2b533ae60e [2.2.x] Added CVE-2019-12781 to the security release archive.
Backport of 868cd56f05 from master
2019-07-01 10:21:16 +02:00
Mariusz Felisiak 4f2713ff0e [2.2.x] Added release date for 2.2.3.
Backport of fc41401f33 from master
2019-07-01 07:51:53 +02:00
Carlton Gibson 77706a3e47 [2.2.x] Fixed CVE-2019-12781 -- Made HttpRequest always trust SECURE_PROXY_SSL_HEADER if set.
An HTTP request would not be redirected to HTTPS when the
SECURE_PROXY_SSL_HEADER and SECURE_SSL_REDIRECT settings were used if
the proxy connected to Django via HTTPS.

HttpRequest.scheme will now always trust the SECURE_PROXY_SSL_HEADER if
set, rather than falling back to the request scheme when the
SECURE_PROXY_SSL_HEADER did not have the secure value.

Thanks to Gavin Wahl for the report and initial patch suggestion, and
Shai Berger for review.

Backport of 54d0f5e62f from master
2019-07-01 07:50:48 +02:00
Mariusz Felisiak db9f7b44fc [2.2.x] Added stub release notes for security releases.
Backport of 30b3ee9d0b from master
2019-07-01 07:03:03 +02:00
Claude Paroz b3f7262e6e [2.2.x] Updated translations from Transifex 2019-06-29 16:15:53 +02:00
Tom Forbes bdc1de2199 [2.2.x] Fixed #30588 -- Fixed crash of autoreloader when __main__ module doesn't have __file__ attribute.
Backport of 8454f6dea4 from master
2019-06-26 06:44:57 +02:00
Jon Dufresne e6b2471ce7 [2.2.x] Fixed typos in 1.11.19, 2.0.11, 2.1.6 release notes.
Backport of 2ef6f209f7 from master
2019-06-21 07:10:32 +02:00
Étienne Beaulé 4e6f0024f1 [2.2.x] Fixed #30542 -- Fixed crash of numerical aggregations with filter.
Filters in annotations crashed when used with numerical-type
aggregations (i.e. Avg, StdDev, and Variance). This was caused as the
source expressions no not necessarily have an output_field (such as the
filter field), which lead to an AttributeError: 'WhereNode' object has
no attribute output_field.

Thanks to Chuan-Zheng Lee for the report.

Regression in c690afb873 and two following
commits.

Backport of 4b6dfe1622 from master.
2019-06-05 09:15:21 +02:00
Mariusz Felisiak ca3f86288a [2.2.x] Added stub release notes for 2.2.3.
Backport of 1f81e2df69 from master
2019-06-05 06:58:53 +02:00
Nick Pope ed3dc5119b [2.2.x] Added CVE-2019-12308 to the security release archive.
Backport of 21b1d23912 from master
2019-06-03 21:45:58 +02:00
Nick Pope 162e02b5e4 [2.2.x] Added CVE-2019-11358 to the security release archive.
Backport of 8fb0ea5583 from master
2019-06-03 21:45:41 +02:00
Mariusz Felisiak e6d7641000 [2.2.x] Fixed typos in 1.11.21, 2.1.9, 2.2.2 release notes.
Backport of 100ec901ae from master
2019-06-03 14:10:51 +02:00
Carlton Gibson baaf187a4e [2.2.x] Applied jQuery patch for CVE-2019-11358.
Backport of 34ec52269a from master.
2019-06-03 11:38:57 +02:00
Carlton Gibson afddabf842 [2.2.x] Fixed CVE-2019-12308 -- Made AdminURLFieldWidget validate URL before rendering clickable link.
Backport of deeba6d920 from master.
2019-06-03 11:37:28 +02:00
Carlton Gibson 4a1d25b39f [2.2.x] Added stub release notes for security releases.
Backport of 98c0fe19ee from master
2019-06-03 10:50:09 +02:00
Tom Forbes 7089502b98 [2.2.x] Fixed #30523 -- Fixed updating file modification times on seen files in auto-reloader when using StatReloader.
Previously we updated the file mtimes if the file has not been seen
before - i.e on the first iteration of the loop.

If the mtime has been changed we triggered the notify_file_changed()
method which in all cases except the translations will result in the
process being terminated. To be strictly correct we need to update the
mtime for either branch of the conditional.

Regression in 6754bffa2b.

Backport of 480492fe70 from master
2019-05-29 09:43:10 +02:00
Tom Forbes ace0bec804 [2.2.x] Fixed #30516 -- Fixed crash of autoreloader when re-raising exceptions with custom signature.
Regression in c8720e7696.

Backport of 0344565179 from master
2019-05-29 08:30:22 +02:00
Caio Ariede 1172f078eb [2.2.x] Fixed #30315 -- Fixed crash of ArrayAgg and StringAgg with ordering when used in Subquery.
Backport of a3f91891d2 from master.
2019-05-28 10:39:28 +02:00
Tom Forbes 5bf2c87ece [2.2.x] Fixed #30479 -- Fixed detecting changes in manage.py by autoreloader when using StatReloader.
Regression in c8720e7696.

Backport of b2790f74d4 from master
2019-05-28 09:01:29 +02:00
Thomasina Lee 3d4e53bcb1 [2.2.x] Fixed #30488 -- Removed redundant Coalesce call in SQL generated by SearchVector.
Regression in 405c836336.

Backport of c38e7a79f4 from master
2019-05-20 09:12:32 +02:00
ruchit2801 db7d7901ee [2.2.x] Fixed #30463 -- Fixed crash of deprecation message when Meta.ordering contains expressions.
Regression in 1b1f64ee5a.

Backport of 04042b2b44 from master
2019-05-18 20:05:31 +02:00
Claude Paroz 34a357d519 [2.2.x] Fixed #30459 -- Delegated hide/show JS toggle to parent div.
Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es>

Backport of e286987a27 from master
2019-05-17 08:04:59 +02:00
Mariusz Felisiak 5d1cf9c442 [2.2.x] Added stub release notes for 2.2.2.
Backport of 30dd43884e from master
2019-05-08 14:45:37 +02:00
Mariusz Felisiak e7629cecde [2.2.x] Added release date for 2.2.1.
Backport of 2106b983c4 from master
2019-05-01 07:07:19 +02:00
can 58391b4d16 [2.2.x] Fixed #30412 -- Fixed crash when adding check constraints with OR'ed condition on Oracle and SQLite.
Backport of 719b746620 from master
2019-04-30 13:43:02 +02:00
Simon Charette f36239fa19 [2.2.x] Fixed #30408 -- Fixed crash when adding check constraints with LIKE operator on Oracle and PostgreSQL.
The LIKE operator wildcard generated for contains, startswith, endswith and
their case-insensitive variant lookups was conflicting with parameter
interpolation on CREATE constraint statement execution.

Ideally we'd delegate parameters interpolation in DDL statements on backends
that support it but that would require backward incompatible changes to the
Index and Constraint SQL generating methods.

Thanks David Sanders for the report.

Backport of a8b3f96f6a from master
2019-04-30 08:54:30 +02:00
Tom Forbes d326c743ef [2.2.x] Fixed #30323 -- Fixed detecting changes by autoreloader when using StatReloader.
Backport of 6754bffa2b from master
2019-04-29 12:18:29 +02:00
Tom Forbes 097457afe4 [2.2.x] Refs #30323 -- Prevented crash of autoreloader when get_resolver().urlconf_module raising an exception.
Backport of 0636d4d2aa from master
2019-04-29 12:18:18 +02:00
Carlton Gibson 4f8ebdd098 [2.2.x] Fixed #30351 -- Handled pre-existing permissions in proxy model permissions data migration.
Regression in 181fb60159.

Backport of 98296f86b3 from master
2019-04-27 21:08:46 +02:00
Jacob Green e45763193f [2.2.x] Fixed #30361 -- Increased the default timeout of watchman client to 5 seconds and made it customizable.
Made the default timeout of watchman client customizable via
DJANGO_WATCHMAN_TIMEOUT environment variable.

Backport of ed3c59097a from master
2019-04-26 13:35:47 +02:00
Aarni Koskela a4095dadc4 [2.2.x] Fixed #30312 -- Relaxed admin check from django.contrib.sessions to SessionMiddleware subclasses.
Backport of efeceba589 from master
2019-04-26 11:51:28 +02:00
Alasdair Nicol 3c3df7db8e [2.2.x] Fixed #30318 -- Added check for importability of arguments of custom error handler views.
Thanks to Jon on Stack Overflow for reporting the issue.

Backport of a5accc0368 from master
2019-04-25 11:38:35 +02:00
Simon Charette 88bf635c35 [2.2.x] Fixed #30385 -- Restored SearchVector(config) immutability.
Regression in 1a28dc3887.

The usage of CONCAT to allow SearchVector to deal with non-text fields
made the generated expression non-IMMUTABLE which prevents a functional
index to be created for it.

Using a combination of COALESCE and ::text makes sure the expression
preserves its immutability.

Refs #29582. Thanks Andrew Brown for the report, Nick Pope for the
review.

Backport of 405c836336 from master
2019-04-23 08:32:36 +02:00
Mariusz Felisiak ba20579106 [2.2.x] Made cosmetic edits in docs/releases/2.2.1.txt.
Backport of 753580ecd1 from master
2019-04-19 08:29:23 +02:00
Scott Fitsimones 95811c3de9 [2.2.x] Fixed #30328 -- Fixed crash of IntegerField.validators when limit_value in a custom validator is callable.
Backport of a14c0fda15 from master
2019-04-19 08:21:29 +02:00
can e85317d731 [2.2.x] Fixed #30335, #29139 -- Fixed crash when ordering or aggregating over a nested JSONField key transform.
Backport of d87bd29c4f from master.
2019-04-18 07:37:48 +02:00
Mariusz Felisiak e8de1cc94c [2.2.x] Fixed #30325 -- Reverted "Fixed #29725 -- Removed unnecessary join in QuerySet.count() and exists() on a many-to-many relation."
This reverts commit 1299421cad due to
a regression with custom managers.

Backport of 5f7991c42c from master
2019-04-15 12:39:42 +02:00
Florian Apolloner 896cc71901
[2.2.x] Fixed #30350 -- Prevented recreation of migration for operations with a range object.
Thanks to Mariusz Felisiak for helping with the patch.

Backport of 2e38f2015a from master.
2019-04-14 12:58:34 +02:00
Florian Apolloner b88ffef7ea [2.2.x] Fixed #30330 -- Fixed setting of primary key to None during fast-delete.
Regression in bc7dd8490b.

Backport of afc708cf6d from master
2019-04-08 21:44:17 +02:00
Tim Graham 53c83387cf [2.2.x] Refs #27807 -- Removed docs for User.username_validator.
The new override functionality claimed in refs #21379 doesn't work.
Forwardport of 714fdbaa70 from stable/1.10.x.
2019-04-07 20:03:01 -04:00
Simone Pellizzari 268ed9cd8a [2.2.x] Fixed #30332 -- Fixed crash of ordering by expressions with params in ArrayAgg and StringAgg.
Backport of d0315584b5 from master.
2019-04-06 15:15:40 +02:00
Nick Pope 9da25fb832 [2.2.x] Fixed #30324 -- Forced utf-8 encoding when loading the template for the technical 500 debug page.
Regression in 50b8493.
Related to ea542a9.

Backport of efb257a017 from master
2019-04-05 16:37:22 +02:00
Mariusz Felisiak 54b65b83a2
[2.2.x] Fixed #30331 -- Added support for psycopg2 2.8.
Backport of 5efaf078f7 from master
2019-04-05 11:07:18 +02:00
msg 1279fb4a00 [2.2.x] Fixed #30307 -- Fixed incorrect quoting of database user password when using dbshell on Oracle.
Regression in acfc650f2a.

Backport of 755673e1bc from master
2019-04-04 10:07:57 +02:00
Mariusz Felisiak ba682261eb
[2.2.x] Added stub release notes for 2.2.1.
Backport of e6588aa4e7 from master
2019-04-03 08:33:10 +02:00
Alex Gaynor 48493636d3 [2.2.x] Fixed typo in docs/releases/2.2.txt.
Backport of 851d9eac23 from master
2019-04-02 09:19:15 +02:00
Carlton Gibson cfc1197168 [2.2.x] Corrected date format in 2.2 release notes.
Backport of 93daed25a4 from master
2019-04-01 15:01:17 +02:00
Carlton Gibson bc6f1da6e9 [2.2.x] Set release date in v2.2 release notes.
Backport of 7191beec4e from master
2019-04-01 12:13:17 +02:00
Tim Graham 917aa556a9 [2.2.x] Fixed #30289 -- Prevented admin inlines for a ManyToManyField's implicit through model from being editable if the user only has the view permission.
Backport of 8335d59200 from master.
2019-03-30 17:44:58 -04:00
Tim Graham de62ba965f [2.2.x] Added stub 2.1.8 release notes.
Backport of e245046bb6 from master
2019-03-30 13:04:40 -04:00
Mariusz Felisiak 609b7f1123
[2.2.x] Fixed "byte string" typo in various docs and comments.
Backport of 881362986a from master
2019-03-28 10:01:36 +01:00
Nick Pope d7876fc999 [2.2.x] Updated spelling and RFCs in HttpOnly cookie flag docs.
Backport of 398afba084 from master.
2019-03-27 11:11:24 -04:00
Carlton Gibson 19ab698937 [2.2.x] Fixed #30263 -- Doc'd changes to form Media sorting (refs #30179).
Thanks to Tim Graham for review.
Backport of 418263c457 from master
2019-03-18 16:27:36 +01:00
Jon Dufresne 37cc6a9dce [2.2.x] Fixed #30171 -- Fixed DatabaseError in servers tests.
Made DatabaseWrapper thread sharing logic reentrant. Used a reference
counting like scheme to allow nested uses.

The error appeared after 8c775391b7.
Backport of 76990cbbda from master.
2019-02-14 10:05:13 -05:00
Tim Graham c3655b1528 [2.2.x] Refs #29478 -- Clarified cached_property 2.2 release note.
Backport of 3b64e2b775 from master.
2019-02-12 18:35:03 -05:00
Tim Graham 74428138cc [2.2.x] Added CVE-2019-6975 to the security release archive.
Backport of d6e5aad5c7 from master.
2019-02-11 16:14:50 -05:00
Tim Graham f548ac7fa5 [2.2.x] Refs #30177 -- Forwardported 2.0.13 release notes.
Backport of 1b8f552b08 from master.
2019-02-11 15:52:15 -05:00
Carlton Gibson 1672ed5ccf [2.2.x] Refs #30175 -- Added release notes for 2.1.7, 2.0.12, and 1.11.20 releases.
Backport of b39bd0aa6d from master
2019-02-11 15:47:54 +01:00
Atul Varma 1092bf02e6 [2.2.x] Fixed typo in docs/releases/2.2.txt.
Backport of b6bb912e9c from master.
2019-02-11 08:54:23 -05:00
Carlton Gibson 83ab3e2664 [2.2.x] Fixed CVE-2019-6975 -- Fixed memory exhaustion in utils.numberformat.format().
Thanks Sjoerd Job Postmus for the report and initial patch.
Thanks Michael Manfre, Tim Graham, and Florian Apolloner for review.

Backport of 402c0caa85 from master
2019-02-11 11:10:38 +01:00