First pass at supporting Django 1.7 (trunk)