Mock: added argument matcher and fluent arg matcher
Merge remote-tracking branch 'origin/master'