Update the django1.5 branch

Update the django1.5 branch with more recent changes, and with changed automatically made by the venv installation.