Merge branch 'master' into classpath-access