Django 1.5-Don-Not-Merge

Upgrading to Django-1.5.1

(details will be added once the PR is finished)