Jeff Triplett ✨
merged in #djangocon issues