mock: added thenThrow
Merge remote-tracking branch 'origin/master'