Django 1.4.5

DO NOT MERGE YET

rebased the django 1.4.5 branch on master