scala 2.11 support + impact changes