Bug 841773: Upgrade Django.
Merge pull request #636 from pmclanahan/upgrade-django

Bug 841773: Upgrade Django.