Update to Scala 2.11.1; merge with DMR.scala