Move to scala 2.11.4