Task/sets django 15

Merging the django 1.5 changes into master