Upgrade to django 1.6.4 (bug 1005911)
Merge pull request #2017 from diox/upgrade-to-django-1.6.4

Upgrade to django 1.6.4 (bug 1005911)