Merge with Scala 2.11.1 done