Fixed typos in "matching"
Merge branch '2.4' into fixtypos
Merge pull request #2539 from mjul:fixtypos