fixup! Upgrade to django 1.6
Merge pull request #6027 from open-craft/django17/transactions

Django 1.6 transaction changes