Upgrade to Django 1.6 (bug 850885)

This reverts commit f6b8ebc29a3fa1b1fc075fef1ac85e7337f7f966.