Merge branch 'master' into class-access