Added support for matchit
Merge commit 'upstream/master'