Merge support for Scala 2.10