I think we haven't normally backported these updates to security fix branches, but given there are more people building their own versions from these branches now, seems like we may as well save them a step.

Thanks @zooba for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8.
🐍🍒⛏🤖

Sorry, @zooba and @ambv, I could not cleanly backport this to 3.8 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker fcfa505b80bcb7600e3b7605cab27627df07faf1 3.8

Sorry @zooba and @ambv, I had trouble checking out the 3.7 backport branch.
Please retry by removing and re-adding the "needs backport to 3.7" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker fcfa505b80bcb7600e3b7605cab27627df07faf1 3.7