Fixes transactions in django 1.6
Merge remote-tracking branch 'floppya/django-1.6-transactions'

Fix Django 1.6 transactions