Django 1.4.5

rebased the django 1.4.5 branch on master