Bring in fix for #166 from 2.10.x