migrate to scala 2.11.2