Django 1.7 #660