Arnaud: Downgraded to Java 6
bumped version
Merge branch 'hotFix/Java6'