Dropped 'direct_to_template' and solved conflicts for provide support for Django 1.5.4