[MERGE] Handle groups more gracefully in Django