First pass
Merge branch 'master' of java