User server-jre by default
Merge branch 'master' into java7