Thanks, Terran and John! Since the 3.11 feature freeze has passed, I've merged this for inclusion in 3.12.
Thanks, Terran and John! Since the 3.11 feature freeze has passed, I've merged this for inclusion in 3.12.