Merge pull request #1014 from mfournier/fix-path-to-java