Merge branch 'master' of github.com:jorgecarleitao/django into documentation
Fixed intersphinx refs to Python's File Object.