Merge "Fix for Eclipse to not choke on this line of Java Generic (was red) "