Merge license and classpath from origin/master