Update the Java requirement info
Merge branch 'master' into query