moving to scala 2.11