4 6 x

@garyhgohoos @gpazo This is in 4_6_x but not 4_7_x. It's late in the day to get it into 4.7.0. Is it okay to wait for 4.8.0?