Merged changes from return1-django-v1.5 master