Mod's note: The reason for what seems like a double posting of these PRs is that they are actually ever so slightly different. They seem to differ in style, but not in substance. Just wanted you to have all that is available. Thanks for your vigilance, Snowcloud!