Merge 2.10.x

forgot one PR from the 2.10.4-RC2 queue

clean merge, luckily -- review by @retronym