Merge remote-tracking branch 'scala/master' into merge-2.10.x