Mock: fixed method matcher
Merge remote-tracking branch 'origin/master'