Fix badly nested transactions in django >= 1.6
Merge branch 'bug/django1.6_transaction_mgmt'