This change is in master but not 2.14.

[ci skip]