GRECLIPSE-1773 Fix and test
GRECLIPSE-1773 Fix for broken tests
GRECLIPSE-1773 Comment added
Merge branch 'GRECLIPSE-1773'
Crazy fix for generics