Java 1.6 source compliance
Merge branch '1.1'