Merge branch 'master' into scala210-master