Fix a typo
Merge branch '2.4'