Merge pull request #2151 from sylvestre/patch-6

Also add mistmatch->mismatch