Merge branch 'master' into reference-class