new line 4
java 5
new 6
Merge branch 'java6' into NewJava