Merge add-java7 branch to master