DjangoProject Ticket 20822

Tests pass under linux.