brings 2.10.x up to speed with 34580a085e@master