Preparation for 2.1 release.
Fixed bug that caused problems when several class methods are mocked.