updated for django > 1.6