fix transaction on select_for_update change in Django 1.6.3
Merge branch 'develop'