Changed pickle import
Merge branch 'django-1.5'