fixed issue 307: Better generics support for mocks and stubs
Merge branch 'groovy-1.8' into groovy-1.9