Fix typo
Merge branch '3.1-maint'