Remove some unnecessary references to broken isA matcher
Merge remote-tracking branch 'origin/master'