Stable/1.5.x

Solution for ticket https://code.djangoproject.com/ticket/19978