Merge "Update eclipse classpath"