Comment 9 for bug 1579225

Thanks for the testing, everybody! I've pushed the patch to master and rel_2_10, along with a live_t regression test I wrote as part of doing a final check of the patch.