Java 1.6 compliance
Merge branch '1.1'