migration to scala 2.11