Merge up to e97a2536df9f8eb36ff64e4810f57527f329525b from scala-dist