Make it a bit less ugly
Merge branch 'refs/heads/master' into django-1.4