dd1a40a3c0
Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)