Typo
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x