Recommit of 2.1-RC1 with Java 6 compatibility