Build with Scala 2.10 including one Scala 2.10 fix in code.