1.x branch should have this fix as well

From gh-1269