Updating docs.
Merge branch 'master' into django