Cherry pick 'Upgrade to scala 2.10.2' from dylex