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