PR for ticket #18314 made it into Django