Changes to upgrade to scala 2.10.0