Update to scala 2.11