TooMuhchMatches was broken.

Fixed this problem, and renamed to TooManyMatches.

Fixes #478.
Merge branch '2.0'