Support Django 1.7 upgrades.

Change-Id: I84b8d335411f3672d9c124401391672a75a0bb19