Merge master to java7