Fixed / Proposal for #13181, also thanks to Klaas van Schelven.

https://code.djangoproject.com/ticket/13181