Merge branch 'master' into 2.2
Fixes #186: Support mocking Traversable interface.
Merge branch '2.1' into 2.2
Merge branch '2.2'