Upgrade to django1.6