Java 7 branch
Merge branch 'java7'