1.7 requires Django 1.4 or better

Thanks to Andi Albrecht for the pointer!
Merge branch 'master' into next

* master:
  1.7 requires Django 1.4 or better